diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
index f8e7e539aae..4a1e8110f6f 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,6 +2,3 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
-  [Hit test within unscaled box]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/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/custom-elements/reactions/HTMLMediaElement.html.ini b/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
deleted file mode 100644
index 2ca05f57bb0..00000000000
--- a/tests/wpt/metadata-layout-2020/custom-elements/reactions/HTMLMediaElement.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[HTMLMediaElement.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index b756fa7752a..7f99b0d1054 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
@@ -321,12 +321,12 @@
   [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+    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-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index 70efd28ddfc..30e1b851fd4 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
deleted file mode 100644
index dc2e45516de..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index f29162631b3..8e2b6af33d8 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,5 @@
 [embedded-opener-remove-frame.html]
-  expected: CRASH
+  expected: TIMEOUT
   [opener of discarded nested browsing context]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 5c3ac06f42a..09ae27d7480 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -171,3 +171,6 @@
   [XHTML img usemap="#hash-id"]
     expected: FAIL
 
+  [HTML (standards) IMG usemap="no-hash-name"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html.ini
new file mode 100644
index 00000000000..cac7560bb56
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html.ini
@@ -0,0 +1,2 @@
+[readyState_during_canplaythrough.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 88f4ddd0e9a..42ebcc9d57e 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: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 3080be9afc0..d913fcbb129 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
new file mode 100644
index 00000000000..9f416703229
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-3.html]
+  [<button> should have the same double-submit protection as <input type=submit>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
index dc0bb6acd73..a52c0ade585 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
@@ -1,16 +1,7 @@
 [select-event.html]
-  [input type password: select() a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [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
 
@@ -23,27 +14,12 @@
   [input type text: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: select() a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
@@ -62,9 +38,39 @@
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: selectionStart a second time (must not fire select)]
     expected: FAIL
 
+  [textarea: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionStart out of range 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
+
+  [input type password: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini b/tests/wpt/metadata-layout-2020/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
new file mode 100644
index 00000000000..ca460dc6867
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
@@ -0,0 +1,4 @@
+[activation-behavior.window.html]
+  [<a> that is not connected should be followed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/syntax/serializing-html-fragments/escaping.html.ini b/tests/wpt/metadata-layout-2020/html/syntax/serializing-html-fragments/escaping.html.ini
new file mode 100644
index 00000000000..0ac51d73e65
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/syntax/serializing-html-fragments/escaping.html.ini
@@ -0,0 +1,19 @@
+[escaping.html]
+  [document.implementation.createHTMLDocument and createContextualFragment]
+    expected: FAIL
+
+  [document.implementation.createHTMLDocument and document.write]
+    expected: FAIL
+
+  [DOMParser.parseFromString]
+    expected: FAIL
+
+  [template.innerHTML]
+    expected: FAIL
+
+  [document.implementation.createHTMLDocument and innerHTML]
+    expected: FAIL
+
+  [XMLHttpRequest]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index dbec6f2c2ff..450c88bd32b 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -3,3 +3,6 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
+  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index 66bd350083b..a56bad443a2 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,4 +1,5 @@
 [realtimeanalyser-fft-scaling.html]
+  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 986f93d5340..af4b87ad1ca 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -449,3 +449,6 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-1.1388579153751666e-22\t9.3139332532882690e-1\t9.3139332532882690e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882690e-1 at index of 28696.\n\tMax RelError of 1.0000000000000000e+0 at index of 28696.\n]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-4.0842222620435689e-37\t9.3139332532882690e-1\t9.3139332532882690e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882690e-1 at index of 28696.\n\tMax RelError of 1.0000000000000000e+0 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index f1281b5ae81..b7e13cf7726 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,5 +1,4 @@
 [audiocontext-not-fully-active.html]
-  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 4ab9fc2cec5..90923ea3868 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -1142,6 +1142,15 @@
      ]
     ]
    },
+   "shadow-dom": {
+    "nested-slot-remove-crash.html": [
+     "3081dd6540fe2b2ad42ad3c98ca1bde29b0c79dd",
+     [
+      null,
+      {}
+     ]
+    ]
+   },
    "svg": {
     "animations": {
      "animated-classname-crash.svg": [
@@ -127360,12 +127369,12 @@
       ]
      ],
      "box-shadow-radius-000.html": [
-      "7ca2cffad0cd4e89c1e12bd928bd8aa4f3ae28e2",
+      "69474d1a5d2dcb5a6847c7e7692ee7f1115d772c",
       [
        null,
        [
         [
-         "/css/css-backgrounds/box-shadow-radius-001-ref.html",
+         "/css/css-backgrounds/box-shadow-radius-000-ref.html",
          "=="
         ]
        ],
@@ -143442,7 +143451,7 @@
       ]
      ],
      "flexbox-min-height-auto-002b.html": [
-      "e8c94f766f74583abc64c7af1ed6a16317442292",
+      "412b4b98c714320202c2fe02794583796bd546af",
       [
        null,
        [
@@ -334326,6 +334335,10 @@
     }
    },
    "document-policy": {
+    "META.yml": [
+     "673defaa02ed0eab478056f8bb12ad4cb82f8c74",
+     []
+    ],
     "echo-policy-nested.html": [
      "5a01f4e1ece983dc44136b763dc93430a5578c2b",
      []
@@ -341728,7 +341741,7 @@
     },
     "cross-origin-embedder-policy": {
      "META.yml": [
-      "103217d38892308541fbc0dbc8d39acfb47d4e80",
+      "dc7010880b61d455c7ecdc43cbc2a4e00081bd19",
       []
      ],
      "README.md": [
@@ -341936,7 +341949,7 @@
     },
     "cross-origin-opener-policy": {
      "META.yml": [
-      "6c6d26211861f5af94cebae7a687b70d10ffe1b4",
+      "b9d578d22f005fd46b503da335202abae340c54c",
       []
      ],
      "README.md": [
@@ -351966,6 +351979,10 @@
     ]
    },
    "installedapp": {
+    "META.yml": [
+     "fa67e2fdfae76093fe0b130e781b97cbd496f435",
+     []
+    ],
     "resources": {
      "iframe.html": [
       "8c7fe21114be50b7f92ef014b8ff6660b1500a95",
@@ -352195,7 +352212,7 @@
      []
     ],
     "encrypted-media.idl": [
-     "0a43cb7481b0a790327542c6e0694496b86f527d",
+     "851232b8bf7c68559295dd211766f8c0f34124f2",
      []
     ],
     "entries-api.idl": [
@@ -352795,7 +352812,7 @@
    },
    "js": {
     "META.yml": [
-     "d4cbc628516bf0d2694b6a420d81a6d05e0eee0a",
+     "555eb7fe2fc42c42d3d30deccf4fd4858ec5ef9d",
      []
     ],
     "builtins": {
@@ -353715,7 +353732,7 @@
    },
    "measure-memory": {
     "META.yml": [
-     "0c7b5bf7808ac6fc2d45883ed73c2ed81116fcb7",
+     "c80aa788b85e3216b16b1e7e7dcba062d7143efb",
      []
     ],
     "README.md": [
@@ -354684,6 +354701,10 @@
     ]
    },
    "native-file-system": {
+    "META.yml": [
+     "b4eaf1a49c5d1d841b116a4ec272b7b2b60dc87a",
+     []
+    ],
     "README.md": [
      "6905a68e7901ce26bc1a363062304e1536604400",
      []
@@ -359206,6 +359227,10 @@
     ]
    },
    "screen_enumeration": {
+    "META.yml": [
+     "abfee89ffbdd29ccd2741bbd3d4a314387025509",
+     []
+    ],
     "README.md": [
      "42a5ebfc5169f43fa9289e85fed4d640071fde3d",
      []
@@ -360632,18 +360657,6 @@
        "ff333bd97da4c6949a3142ac8789cb2e45d41b86",
        []
       ],
-      "dummy-worker-interceptor.js": [
-       "5129ed51ea550c210abc53e11209e7a3e9dc36b1",
-       []
-      ],
-      "dummy.html": [
-       "12a179980df2ff60c258827119c78a645e1a74a7",
-       []
-      ],
-      "dummy.txt": [
-       "802992c4220de19a90767f3000a79a31b98d0df7",
-       []
-      ],
       "echo-content.py": [
        "70ae4b60254cf7971cdd92dc2b1e382ef1a6196b",
        []
@@ -360837,7 +360850,7 @@
        []
       ],
       "fetch-event-within-sw-worker.js": [
-       "f3180d776c5b02ed2cf202c298fabfd1e8f8ea11",
+       "5903bab968dc47aec8d5a51da1422d1eccbdb076",
        []
       ],
       "fetch-event-worker-timing.js": [
@@ -360849,11 +360862,11 @@
        []
       ],
       "fetch-mixed-content-iframe-inscope-to-inscope.html": [
-       "b6a260d066bfba04023ae35cf5bfb5690c9f9c5e",
+       "64a634e9db7b955bcb291ffa02b23da3b8962f47",
        []
       ],
       "fetch-mixed-content-iframe-inscope-to-outscope.html": [
-       "b8c940c2a0a5680aa2282cb7e3b619408ed82f86",
+       "be0b5c8f561defcf7b10977f54d270ab838bc09f",
        []
       ],
       "fetch-mixed-content-iframe.html": [
@@ -360865,11 +360878,11 @@
        []
       ],
       "fetch-request-css-base-url-style.css": [
-       "7643f667adbc263243d93f6fa3a3b46a77d4de11",
+       "f14fcaae7275d42f68cac83eed6d78727461a6e3",
        []
       ],
       "fetch-request-css-base-url-worker.js": [
-       "e8dbd2725c68f9326c41ae5e7bde65158970a272",
+       "10d3b1880934e633ecaaf9a0dc590547ce46e462",
        []
       ],
       "fetch-request-css-cross-origin-mime-check-cross.css": [
@@ -360909,11 +360922,11 @@
        []
       ],
       "fetch-request-html-imports-iframe.html": [
-       "795185944e9423038e70421bcb86ed4537e0687f",
+       "07a084257a8cfec3a1e6310433c6d5b0b7693f55",
        []
       ],
       "fetch-request-html-imports-worker.js": [
-       "5525d526866af8a9941031d0bc54621b2c6d62bf",
+       "110727bd52cf62242778482e49a6ccf7a902bfb9",
        []
       ],
       "fetch-request-no-freshness-headers-iframe.html": [
@@ -360937,11 +360950,11 @@
        []
       ],
       "fetch-request-resources-worker.js": [
-       "5c9e86d66846605a96a9fd61889e71b7ad4b7d00",
+       "983cccb8db7895d8d72943061b6660a86fe99a04",
        []
       ],
       "fetch-request-xhr-iframe.https.html": [
-       "4e8116c0c4122dd9fe7b1d150b384f7849f6b57d",
+       "b3ddec1a701b438025d9b5dd2075662dadb79bf6",
        []
       ],
       "fetch-request-xhr-sync-iframe.html": [
@@ -360957,7 +360970,7 @@
        []
       ],
       "fetch-request-xhr-worker.js": [
-       "91b3abb14d9c675a0bd886344a26482f36bb5770",
+       "4e428374bc227191c1bf7ac23d27b820aa56dd9e",
        []
       ],
       "fetch-response-taint-iframe.html": [
@@ -360965,11 +360978,11 @@
        []
       ],
       "fetch-response-xhr-iframe.https.html": [
-       "612c9341eb785768a3d4f9ad5ba2910fc90f677d",
+       "c26eebee49d83e768b9e58f55d6e4687a2c5c110",
        []
       ],
       "fetch-response-xhr-worker.js": [
-       "465fbc91baa71669ca9c3f32117ee834de8294d0",
+       "0301b12c18a54b2c24ec430c469390545abd7a50",
        []
       ],
       "fetch-rewrite-worker-referrer-policy.js": [
@@ -361101,11 +361114,11 @@
        []
       ],
       "invalid-blobtype-iframe.https.html": [
-       "1e6cacb55d7f80f6c71e3be513c10a756d66543b",
+       "04a9cb515e092153ee016fa9a3e3da63635c55b1",
        []
       ],
       "invalid-blobtype-worker.js": [
-       "93f496ef44e713ca246fb82e1cbf71391143bcef",
+       "865dc30d428228d9fc5c0161d669360f84df7660",
        []
       ],
       "invalid-chunked-encoding-with-flush.py": [
@@ -361117,19 +361130,19 @@
        []
       ],
       "invalid-header-iframe.https.html": [
-       "80531b79db95723f880d6bb8f36332f1d41ac3de",
+       "8f0e6baca1757cfc18c929438b72750920303343",
        []
       ],
       "invalid-header-worker.js": [
-       "31e7f29d06fd7e4f2d38560339ec4445eec51328",
+       "850874b8116dabc2a86de9c183ca430b2a415f06",
        []
       ],
       "iso-latin1-header-iframe.html": [
-       "90e3f698cfa6bb6d12ee8184953b4f7fbde719e4",
+       "cf2fa8d14f7c6089d11979e4be4094f4e7fbab25",
        []
       ],
       "iso-latin1-header-worker.js": [
-       "3ab5c7e73186b49d88eaae971ce8c2a6bef5d431",
+       "d9ecca277b3fae5bc4698ff467a85714be7b15a3",
        []
       ],
       "load_worker.js": [
@@ -361141,11 +361154,11 @@
        []
       ],
       "local-url-inherit-controller-frame.html": [
-       "b331f88d47179ef15d3f2634f84d6a2791001934",
+       "5520c3a31bf70a88ec7441f29cc7d5ab3401332f",
        []
       ],
       "local-url-inherit-controller-worker.js": [
-       "9d8955f111f6f3624da8a31e033544e738ba2751",
+       "4b7aad0f58a850f0e9f6765b84ae08cccc62f6d3",
        []
       ],
       "malformed-http-response.asis": [
@@ -361357,7 +361370,7 @@
        []
       ],
       "performance-timeline-worker.js": [
-       "cac327c34bf9df184913c561b584b038f3504c94",
+       "6c6dfcbd281173549535af9cbab4f461b1e2b21c",
        []
       ],
       "postmessage-blob-url.js": [
@@ -361469,11 +361482,11 @@
        []
       ],
       "resource-timing-iframe.sub.html": [
-       "41bc2e77c1b4acb3a57a83f9c9889f4e9c538103",
+       "384c29b536bf1db829532b9485d41020f85bed95",
        []
       ],
       "resource-timing-worker.js": [
-       "5bc6ef34748f6de4b418fd16d2261a4276483a6a",
+       "b74e8cd6a236bd7c4477910a064f366e3da8470b",
        []
       ],
       "respond-then-throw-worker.js": [
@@ -361492,6 +361505,18 @@
        "b9c28f51f90a8fc95c687713d945f4a19b127a64",
        []
       ],
+      "sample-worker-interceptor.js": [
+       "5129ed51ea550c210abc53e11209e7a3e9dc36b1",
+       []
+      ],
+      "sample.html": [
+       "12a179980df2ff60c258827119c78a645e1a74a7",
+       []
+      ],
+      "sample.txt": [
+       "802992c4220de19a90767f3000a79a31b98d0df7",
+       []
+      ],
       "sandboxed-iframe-fetch-event-iframe.html": [
        "239fa7330371bceb58567186d18095d04e4eee5b",
        []
@@ -361613,7 +361638,7 @@
        []
       ],
       "test-helpers.sub.js": [
-       "38840b75303dc598cf66a8771e51bbc5877db8fa",
+       "3f6a2055f68bd33d124774c3f14301ba53f7653f",
        []
       ],
       "test-request-headers-worker.js": [
@@ -363897,7 +363922,7 @@
      }
     },
     "localpaths.py": [
-     "87eafccf4d23367d765cffd9754543c72aec38a7",
+     "a79acb82a50c55ece58bb6040f6b9a19808c8a2a",
      []
     ],
     "manifest": {
@@ -370446,6 +370471,112 @@
         []
        ]
       }
+     },
+     "zipp": {
+      ".flake8": [
+       "790c109fdbef2581d223125bd21b663cb354c2d2",
+       []
+      ],
+      ".pre-commit-config.yaml": [
+       "922d94247a0d7639cbe137435cd9dee84ef0ab8b",
+       []
+      ],
+      ".readthedocs.yml": [
+       "8ae4468428bedf7441c4b43928425055a4453191",
+       []
+      ],
+      ".travis.yml": [
+       "b7d8f3ac9d6fb151a63a4ee74984dd755564bc5e",
+       []
+      ],
+      "CHANGES.rst": [
+       "a464a6324b7bea813db8846bd6c69fe9cdec433f",
+       []
+      ],
+      "LICENSE": [
+       "5e795a61f302ff5d425eac2281ff13c15b21ed1b",
+       []
+      ],
+      "PKG-INFO": [
+       "33ef1cf01c4b232648a70a0f2fa9733a4232b498",
+       []
+      ],
+      "README.rst": [
+       "ce128a32ba3113f118830a1fb975879b7dd1038b",
+       []
+      ],
+      "appveyor.yml": [
+       "f35aa27d684244ed59c1dedfd84d758aedab4cd2",
+       []
+      ],
+      "conftest.py": [
+       "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
+       []
+      ],
+      "docs": {
+       "conf.py": [
+        "41b53557fb2e372683899c51a6a5892b80bc5935",
+        []
+       ],
+       "history.rst": [
+        "8e217503ba1a68826af8e1e9db4bd16ce7a21857",
+        []
+       ],
+       "index.rst": [
+        "ff49bf9dc706d62c9e8524f346db1bdd63d026bb",
+        []
+       ]
+      },
+      "pyproject.toml": [
+       "3afc8c33b78baa7666d30f38ee522c84a21bfb7f",
+       []
+      ],
+      "setup.cfg": [
+       "ef4abd248a435a9f990f78401172db9f6f3650e3",
+       []
+      ],
+      "setup.py": [
+       "827e955fcd6c2af63ad1ad4cb42e41e29e62074f",
+       []
+      ],
+      "skeleton.md": [
+       "52b97f09b418894679951fb9867b5b0dc6618f1b",
+       []
+      ],
+      "test_zipp.py": [
+       "810d10bd68fc27f897dff2d411582de979962451",
+       []
+      ],
+      "tox.ini": [
+       "cb542c136c38eaf330fd2e9b3231d1010fbe1aac",
+       []
+      ],
+      "zipp.egg-info": {
+       "PKG-INFO": [
+        "33ef1cf01c4b232648a70a0f2fa9733a4232b498",
+        []
+       ],
+       "SOURCES.txt": [
+        "845b342cefc40058134ac715dc8fa806e40b6e95",
+        []
+       ],
+       "dependency_links.txt": [
+        "8b137891791fe96927ad78e64b0aad7bded08bdc",
+        []
+       ],
+       "requires.txt": [
+        "90bab46ac4930d35f39e82172aadf0e9a5bdd8a2",
+        []
+       ],
+       "top_level.txt": [
+        "e82f676f82a3381fa909d1e6578c7a22044fafca",
+        []
+       ]
+      },
+      "zipp.py": [
+       "892205834abaee2b4c1d3bb4507609de0ad1c2f6",
+       []
+      ]
      }
     },
     "tox.ini": [
@@ -374685,7 +374816,7 @@
    },
    "webrtc-extensions": {
     "META.yml": [
-     "4ceee0664cbfb800ac8b410c295dde4c7009b024",
+     "be8cb028f08842589d6c2f06391bc5c8469048d2",
      []
     ]
    },
@@ -378399,7 +378530,7 @@
    ],
    "x-frame-options": {
     "META.yml": [
-     "21ef0699364f406f337cfda70d974bacc4b5a934",
+     "622213edadbf2145a5039c8b06923ec9cc48bab4",
      []
     ],
     "README.md": [
@@ -495437,6 +495568,13 @@
       ]
      },
      "serializing-html-fragments": {
+      "escaping.html": [
+       "1602964ee1dc21c57f0fa22981edeaeaafcae026",
+       [
+        null,
+        {}
+       ]
+      ],
       "initial-linefeed-pre.html": [
        "d4e30bb60d3e0a9ac7c0f954c3e9d7441b9457b9",
        [
@@ -529635,7 +529773,7 @@
       ]
      ],
      "activation.https.html": [
-      "e6f136e6b8bb6ae5c7ae4d40555c90abbc80fdef",
+      "278454d3383e3d71a3925663dfcfc3444eddff83",
       [
        null,
        {
@@ -529872,7 +530010,7 @@
       ]
      ],
      "detached-context.https.html": [
-      "cbb818f7ac0ebcb87ea53d94e85b5045d9ead35e",
+      "747a953f6203758f0ff7d18fc6eb8cc9c19f17de",
       [
        null,
        {}
@@ -529969,7 +530107,7 @@
       ]
      ],
      "fetch-csp.https.html": [
-      "4f176220d6100c4efb1bfda817b84cf5f53a4f3d",
+      "2522f4828bd02907e74012062da68d68f57aae83",
       [
        null,
        {}
@@ -530004,7 +530142,7 @@
       ]
      ],
      "fetch-event-handled.https.html": [
-      "89f3d79a681a22cfd6889b3c0603f7388d460472",
+      "8d39b65bb628b8dcda07c804162583c80986a6c3",
       [
        null,
        {}
@@ -530099,7 +530237,7 @@
       ]
      ],
      "fetch-event-within-sw.https.html": [
-      "f5a60c3060961a2b1674c8959c5d4a0af7b5452a",
+      "0b52b18305faa1e36ea6873ed534913adb6e5c75",
       [
        null,
        {
@@ -530158,7 +530296,7 @@
       ]
      ],
      "fetch-request-css-base-url.https.html": [
-      "a08e0c74881364f7fd29d3e6ac332a7e1d94bf7a",
+      "467a66cee464e687238c25da2fb17cb01501fb0d",
       [
        null,
        {}
@@ -530172,7 +530310,7 @@
       ]
      ],
      "fetch-request-css-images.https.html": [
-      "958de1af85f4ee6ba58b47de38971f9ff2aa2ba0",
+      "586dea26135fc535bf812d86c9854541daabbc39",
       [
        null,
        {}
@@ -530193,7 +530331,7 @@
       ]
      ],
      "fetch-request-redirect.https.html": [
-      "57fb8eb4c95d54b20d674728270e140db0f6b473",
+      "5ce015b421fcaf73777926b6cb1f1a2aa0a1d30f",
       [
        null,
        {
@@ -530202,7 +530340,7 @@
       ]
      ],
      "fetch-request-resources.https.html": [
-      "50864ca78955ea2d52b8e6f71abe2dd6dfef431a",
+      "b4680c3ccd58d9d7def9d69ff1d1048a6ae02905",
       [
        null,
        {}
@@ -530585,7 +530723,7 @@
       ]
      ],
      "performance-timeline.https.html": [
-      "1fe19da53be6c460cae5f069794bbdee3f4a0da8",
+      "e56e6fe416ff215341ba9b6df088f111f9645623",
       [
        null,
        {}
@@ -530652,7 +530790,7 @@
       ]
      ],
      "redirected-response.https.html": [
-      "7262af36aba6977638cccc341d6935979cc86af6",
+      "d2c7858beddfcf471a4c157fea16bab4baa1e45b",
       [
        null,
        {}
@@ -530805,7 +530943,7 @@
       ]
      ],
      "registration-updateviacache.https.html": [
-      "b7b2b40d756a21dc178730dbbd7fa561ac9f723a",
+      "b2f6bbc6f849c7e8051f1aedc9f476c47d5a39a4",
       [
        null,
        {
@@ -530835,7 +530973,7 @@
       ]
      ],
      "resource-timing.sub.https.html": [
-      "f2f81bc35a1a49e2e690a967d16caf90b5c2e257",
+      "9808ae5ae1bed06f5303240b772e4ead0d317137",
       [
        null,
        {}
@@ -531034,7 +531172,7 @@
       ]
      ],
      "update-after-oneday.https.html": [
-      "d9b9fcfb8db37ea3b0d571250b22b88ca7354772",
+      "e7a8aa42d307799b157fd3994ac291d5c596bfd1",
       [
        null,
        {}
@@ -531182,7 +531320,7 @@
       ]
      ],
      "worker-interception.https.html": [
-      "302a214ac619400c38f7564c065a5e0be47ac6df",
+      "eb79203a44183403704ebe0389b2bb957a327d56",
       [
        null,
        {
@@ -531191,7 +531329,7 @@
       ]
      ],
      "xhr-response-url.https.html": [
-      "1ad2ce3851cc7bce24120dd80bdf54662781ac66",
+      "673ca52cc67450f8b296ea50f7ac4c4fee310602",
       [
        null,
        {}
@@ -531335,7 +531473,7 @@
       ]
      ],
      "declarative-shadow-dom-opt-in.tentative.html": [
-      "d1fd9fc448a220c270dff51117648ccc8ba16607",
+      "a49e759ed4a7cc7f3c63f8e4452ee5915169ae5b",
       [
        null,
        {}
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
deleted file mode 100644
index 4bfb0c2053a..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-004.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
index f8e7e539aae..4a1e8110f6f 100644
--- a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,6 +2,3 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
-  [Hit test within unscaled box]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/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/custom-elements/reactions/HTMLMediaElement.html.ini b/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
deleted file mode 100644
index 2ca05f57bb0..00000000000
--- a/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[HTMLMediaElement.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 5b3157dfbc1..849d3a7947c 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -321,12 +321,12 @@
   [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+    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/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 70efd28ddfc..30e1b851fd4 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
deleted file mode 100644
index dc2e45516de..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index c757b400205..fd369192a02 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,5 @@
 [embedded-opener-remove-frame.html]
-  expected: CRASH
+  expected: TIMEOUT
   [opener and "removed" embedded documents]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 1de3f8d68b2..98163335e40 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -172,3 +172,6 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
+  [HTML (standards) IMG usemap="no-hash-name"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html.ini
new file mode 100644
index 00000000000..cac7560bb56
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/media-elements/readyState_during_canplaythrough.html.ini
@@ -0,0 +1,2 @@
+[readyState_during_canplaythrough.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 2a166bb97b7..fc37df7e3fa 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: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 963d4cd20ef..9df1ac56f2a 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
new file mode 100644
index 00000000000..9f416703229
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-3.html]
+  [<button> should have the same double-submit protection as <input type=submit>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
index dc0bb6acd73..a52c0ade585 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
@@ -1,16 +1,7 @@
 [select-event.html]
-  [input type password: select() a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [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
 
@@ -23,27 +14,12 @@
   [input type text: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: select() a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
@@ -62,9 +38,39 @@
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: selectionStart a second time (must not fire select)]
     expected: FAIL
 
+  [textarea: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionStart out of range 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
+
+  [input type password: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [textarea: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini b/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
new file mode 100644
index 00000000000..ca460dc6867
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
@@ -0,0 +1,4 @@
+[activation-behavior.window.html]
+  [<a> that is not connected should be followed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/syntax/serializing-html-fragments/escaping.html.ini b/tests/wpt/metadata/html/syntax/serializing-html-fragments/escaping.html.ini
new file mode 100644
index 00000000000..0ac51d73e65
--- /dev/null
+++ b/tests/wpt/metadata/html/syntax/serializing-html-fragments/escaping.html.ini
@@ -0,0 +1,19 @@
+[escaping.html]
+  [document.implementation.createHTMLDocument and createContextualFragment]
+    expected: FAIL
+
+  [document.implementation.createHTMLDocument and document.write]
+    expected: FAIL
+
+  [DOMParser.parseFromString]
+    expected: FAIL
+
+  [template.innerHTML]
+    expected: FAIL
+
+  [document.implementation.createHTMLDocument and innerHTML]
+    expected: FAIL
+
+  [XMLHttpRequest]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 0cef5158fae..01f7b72cbe7 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -4,3 +4,6 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
+  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index 66bd350083b..a56bad443a2 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,4 +1,5 @@
 [realtimeanalyser-fft-scaling.html]
+  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 0da477df70d..3981339bab2 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -677,3 +677,6 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-1.1388579153751666e-22\t9.3139332532882690e-1\t9.3139332532882690e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882690e-1 at index of 28696.\n\tMax RelError of 1.0000000000000000e+0 at index of 28696.\n]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-4.0842222620435689e-37\t9.3139332532882690e-1\t9.3139332532882690e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882690e-1 at index of 28696.\n\tMax RelError of 1.0000000000000000e+0 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
index f1281b5ae81..b7e13cf7726 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-not-fully-active.html.ini
@@ -1,5 +1,4 @@
 [audiocontext-not-fully-active.html]
-  expected: TIMEOUT
   [frame in navigated remote-site frame]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/metadata/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-000.html b/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-000.html
index 7ca2cffad0c..69474d1a5d2 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-000.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-radius-000.html
@@ -2,7 +2,7 @@
 <title>Box Shadow Border Radius (Outset)</title>
 <link rel="author" title="Elika J. Etemad" href="http://fantasai.inkedblade.net/contact">
 <link rel="help" href="https://www.w3.org/TR/css-backgrounds-3/#shadow-shape">
-<link rel="match" href="box-shadow-radius-001-ref.html">
+<link rel="match" href="box-shadow-radius-000-ref.html">
 
 <style>
   body > div {
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002b.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002b.html
index e8c94f766f7..412b4b98c71 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002b.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox-min-height-auto-002b.html
@@ -32,6 +32,7 @@
       .flexbox {
         display: flex;
         flex-direction: column;
+        max-width: 34px; /* Constrain the flex container's cross size. */
         height: 1px;  /* No available space; shrink flex items to min-height */
         margin-right: 2px; /* (Just for spacing things out, visually) */
         float: left;
diff --git a/tests/wpt/web-platform-tests/document-policy/META.yml b/tests/wpt/web-platform-tests/document-policy/META.yml
new file mode 100644
index 00000000000..673defaa02e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/document-policy/META.yml
@@ -0,0 +1 @@
+spec: https://wicg.github.io/document-policy/
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/META.yml b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/META.yml
index 103217d3889..dc7010880b6 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/META.yml
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/META.yml
@@ -1,4 +1,4 @@
-spec: https://mikewest.github.io/corpp/
+spec: https://html.spec.whatwg.org/multipage/origin.html#coep
 suggested_reviewers:
   - mikewest
   - jugglinmike
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/META.yml b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/META.yml
index 6c6d2621186..b9d578d22f0 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/META.yml
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/META.yml
@@ -1,4 +1,4 @@
-spec: https://gist.github.com/annevk/6f2dd8c79c77123f39797f6bdac43f3e
+spec: https://html.spec.whatwg.org/multipage/origin.html#cross-origin-opener-policies
 suggested_reviewers:
   - mikewest
   - jugglinmike
diff --git a/tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/escaping.html b/tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/escaping.html
new file mode 100644
index 00000000000..1602964ee1d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/syntax/serializing-html-fragments/escaping.html
@@ -0,0 +1,89 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Serialization of script-disabled documents should follow escaping rules</title>
+<link rel="author" title="Mason Freed" href="mailto:masonfreed@chromium.org">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/parsing.html#serialising-html-fragments">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<body>
+
+<script>
+const html_escaped = '&amp;&nbsp;&lt;&gt;';
+const html_unescaped = '& <>';
+function getHtml(deEscapeParse) {
+  return `<noscript>${deEscapeParse ? html_escaped : html_unescaped}</noscript>`;
+}
+function testDoc(escapeSerialize, parsedNode) {
+  const node = parsedNode.firstChild;
+  const innerText = node.textContent;
+  assert_equals(innerText, html_unescaped, 'Content should be unescaped');
+  const serialized = node.innerHTML;
+  const expectation = escapeSerialize ? html_escaped : html_unescaped;
+  assert_equals(serialized, expectation, `Serialization ${escapeSerialize ? 'should' : 'should NOT'} re-escape <noscript> contents`);
+}
+
+test(() => {
+  const div = document.createElement('div');
+  document.body.appendChild(div);
+  div.innerHTML = getHtml(false);
+  testDoc(false, div);
+}, 'div.innerHTML');
+
+test(() => {
+  const div = document.createElement('div');
+  div.insertAdjacentHTML('afterbegin',getHtml(false));
+  testDoc(false, div);
+}, 'div.insertAdjacentHTML');
+
+test(() => {
+  const id = 'doc-write-1';
+  document.write(`<div id=${id} style="display:none">${getHtml(false)}</div>`);
+  testDoc(false, document.getElementById(id));
+}, 'document.write on main document');
+
+test(() => {
+  const doc = (new DOMParser()).parseFromString(`<body>${getHtml(true)}</body>`, 'text/html');
+  testDoc(true, doc.body);
+}, 'DOMParser.parseFromString');
+
+test(() => {
+  const template = document.createElement('template');
+  document.body.appendChild(template);
+  template.innerHTML = getHtml(true);
+  testDoc(true, template.content);
+}, 'template.innerHTML');
+
+test(() => {
+  const doc = document.implementation.createHTMLDocument('');
+  doc.body.innerHTML=`<pre>${getHtml(true)}</pre>`;
+  testDoc(true, doc.body.firstChild);
+}, 'document.implementation.createHTMLDocument and innerHTML');
+
+test(() => {
+  const doc = document.implementation.createHTMLDocument('');
+  let range = doc.createRange();
+  range.selectNode(doc.body);
+  const frag = range.createContextualFragment(getHtml(true));
+  testDoc(true, frag);
+}, 'document.implementation.createHTMLDocument and createContextualFragment');
+
+test(() => {
+  const id = 'doc-write-2';
+  const doc = document.implementation.createHTMLDocument('');
+  doc.write(`<div id=${id} style="display:none">${getHtml(false)}</div>`);
+  testDoc(true, doc.getElementById(id));
+}, 'document.implementation.createHTMLDocument and document.write');
+
+async_test((t) => {
+  let client = new XMLHttpRequest();
+  client.addEventListener('load', t.step_func_done(() => {
+    assert_true(client.status == 200 && client.responseXML != null);
+    testDoc(true, client.responseXML.body.firstChild);
+    t.done();
+  }));
+  client.open("GET", `data:text/html,<pre>${getHtml(true)}</pre>`);
+  client.responseType = 'document';
+  client.send();
+}, 'XMLHttpRequest');
+</script>
diff --git a/tests/wpt/web-platform-tests/installedapp/META.yml b/tests/wpt/web-platform-tests/installedapp/META.yml
new file mode 100644
index 00000000000..fa67e2fdfae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/installedapp/META.yml
@@ -0,0 +1 @@
+spec: https://wicg.github.io/get-installed-related-apps/spec/
diff --git a/tests/wpt/web-platform-tests/interfaces/encrypted-media.idl b/tests/wpt/web-platform-tests/interfaces/encrypted-media.idl
index 0a43cb7481b..851232b8bf7 100644
--- a/tests/wpt/web-platform-tests/interfaces/encrypted-media.idl
+++ b/tests/wpt/web-platform-tests/interfaces/encrypted-media.idl
@@ -65,7 +65,7 @@ enum MediaKeySessionType {
     iterable<BufferSource,MediaKeyStatus>;
     readonly        attribute unsigned long size;
     boolean has (BufferSource keyId);
-    any     get (BufferSource keyId);
+    (MediaKeyStatus or undefined)     get (BufferSource keyId);
 };
 
 enum MediaKeyStatus {
diff --git a/tests/wpt/web-platform-tests/js/META.yml b/tests/wpt/web-platform-tests/js/META.yml
index d4cbc628516..555eb7fe2fc 100644
--- a/tests/wpt/web-platform-tests/js/META.yml
+++ b/tests/wpt/web-platform-tests/js/META.yml
@@ -1,3 +1,3 @@
-spec: https://tc39.github.io/ecma262/
+spec: https://tc39.es/ecma262/
 suggested_reviewers:
   - Ms2ger
diff --git a/tests/wpt/web-platform-tests/measure-memory/META.yml b/tests/wpt/web-platform-tests/measure-memory/META.yml
index 0c7b5bf7808..c80aa788b85 100644
--- a/tests/wpt/web-platform-tests/measure-memory/META.yml
+++ b/tests/wpt/web-platform-tests/measure-memory/META.yml
@@ -1,2 +1,3 @@
+spec: https://wicg.github.io/performance-measure-memory/
 suggested_reviewers:
   - ulan
diff --git a/tests/wpt/web-platform-tests/native-file-system/META.yml b/tests/wpt/web-platform-tests/native-file-system/META.yml
new file mode 100644
index 00000000000..b4eaf1a49c5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/native-file-system/META.yml
@@ -0,0 +1 @@
+spec: https://wicg.github.io/file-system-access/
diff --git a/tests/wpt/web-platform-tests/screen_enumeration/META.yml b/tests/wpt/web-platform-tests/screen_enumeration/META.yml
new file mode 100644
index 00000000000..abfee89ffbd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/screen_enumeration/META.yml
@@ -0,0 +1 @@
+spec: https://webscreens.github.io/window-placement/
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/activation.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/activation.https.html
index e6f136e6b8b..278454d3383 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/activation.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/activation.https.html
@@ -50,7 +50,7 @@ function setup_activation_test(t, scope, worker_url) {
         return wait_for_state(t, registration.installing, 'installed');
       })
     .then(() => {
-        return wait_for_activation_on_dummy_scope(t, self);
+        return wait_for_activation_on_sample_scope(t, self);
       })
     .then(() => {
         assert_not_equals(registration.waiting, null);
@@ -70,7 +70,7 @@ promise_test(t => {
           iframe = result.iframe;
           // Finish the in-flight request.
           registration.active.postMessage('go');
-          return wait_for_activation_on_dummy_scope(t, self);
+          return wait_for_activation_on_sample_scope(t, self);
         })
       .then(() => {
           // The new worker is still waiting. Remove the frame and it should
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html
index cbb818f7ac0..747a953f620 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html
@@ -47,14 +47,14 @@ promise_test(t => {
           // resolve on a detached registration.  We can't check for
           // an explicit rejection, though, because not all browsers
           // fire rejection callbacks on detached promises.  Instead
-          // we wait for a dummy scope to install, activate, and
+          // we wait for a sample scope to install, activate, and
           // unregister before declaring that the promises did not
           // resolve.
           r.unregister().then(() => resolvedCount += 1,
                               () => {});
           r.update().then(() => resolvedCount += 1,
                           () => {});
-          return wait_for_activation_on_dummy_scope(t, window);
+          return wait_for_activation_on_sample_scope(t, window);
         })
       .then(() => {
           assert_equals(resolvedCount, 0,
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-csp.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-csp.https.html
index 4f176220d61..2522f4828bd 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-csp.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-csp.https.html
@@ -59,7 +59,7 @@ promise_test(function(t) {
           return assert_resolves(
               frame.contentWindow.load_image(
                   // The request for IMAGE_URL will be fetched in SW.
-                  './dummy?url=' + encodeURIComponent(IMAGE_URL)),
+                  './sample?url=' + encodeURIComponent(IMAGE_URL)),
               'Allowed scope image resource which was fetched via SW should ' +
               'be loaded.');
         })
@@ -67,7 +67,7 @@ promise_test(function(t) {
           return assert_rejects(
               frame.contentWindow.load_image(
                   // The request for REMOTE_IMAGE_URL will be fetched in SW.
-                  './dummy?mode=no-cors&url=' +
+                  './sample?mode=no-cors&url=' +
                   encodeURIComponent(REMOTE_IMAGE_URL)),
               'Disallowed scope image resource which was fetched via SW ' +
               'should not be loaded.');
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-handled.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-handled.https.html
index 89f3d79a681..8d39b65bb62 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-handled.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-handled.https.html
@@ -40,7 +40,7 @@ promise_test(async (t) => {
     ' navigation request');
 
 promise_test(async (t) => {
-  frame.contentWindow.fetch('dummy.txt?respondWith-not-called');
+  frame.contentWindow.fetch('sample.txt?respondWith-not-called');
   const message = await wait_for_message_from_worker();
   assert_equals(message, 'RESOLVED');
 }, 'FetchEvent.handled should resolve when respondWith() is not called for a' +
@@ -48,7 +48,7 @@ promise_test(async (t) => {
 
 promise_test(async (t) => {
   frame.contentWindow.fetch(
-      'dummy.txt?respondWith-not-called-and-event-canceled').catch((e) => {});
+      'sample.txt?respondWith-not-called-and-event-canceled').catch((e) => {});
   const message = await wait_for_message_from_worker();
   assert_equals(message, 'REJECTED');
 }, 'FetchEvent.handled should reject when respondWith() is not called and the' +
@@ -56,7 +56,7 @@ promise_test(async (t) => {
 
 promise_test(async (t) => {
   frame.contentWindow.fetch(
-      'dummy.txt?respondWith-called-and-promise-resolved');
+      'sample.txt?respondWith-called-and-promise-resolved');
   const message = await wait_for_message_from_worker();
   assert_equals(message, 'RESOLVED');
 }, 'FetchEvent.handled should resolve when the promise provided' +
@@ -64,7 +64,7 @@ promise_test(async (t) => {
 
 promise_test(async (t) => {
   frame.contentWindow.fetch(
-      'dummy.txt?respondWith-called-and-promise-resolved-to-invalid-response')
+      'sample.txt?respondWith-called-and-promise-resolved-to-invalid-response')
       .catch((e) => {});
   const message = await wait_for_message_from_worker();
   assert_equals(message, 'REJECTED');
@@ -73,7 +73,7 @@ promise_test(async (t) => {
 
 promise_test(async (t) => {
   frame.contentWindow.fetch(
-      'dummy.txt?respondWith-called-and-promise-rejected').catch((e) => {});
+      'sample.txt?respondWith-called-and-promise-rejected').catch((e) => {});
   const message = await wait_for_message_from_worker();
   assert_equals(message, 'REJECTED');
 }, 'FetchEvent.handled should reject when the promise provided to' +
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-within-sw.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-within-sw.https.html
index f5a60c30609..0b52b18305f 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-within-sw.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-event-within-sw.https.html
@@ -28,12 +28,12 @@ promise_test(async t => {
 
   const iframe = await registerSwAndOpenFrame(t);
   const fetchText =
-      await iframe.contentWindow.fetch('dummy.txt').then(r => r.text());
+      await iframe.contentWindow.fetch('sample.txt').then(r => r.text());
 
   const cache = await iframe.contentWindow.caches.open('test');
-  await cache.add('dummy.txt');
+  await cache.add('sample.txt');
 
-  const response = await cache.match('dummy.txt');
+  const response = await cache.match('sample.txt');
   const cacheText = await (response ? response.text() : 'cache match failed');
   assert_equals(fetchText, 'intercepted', 'fetch intercepted');
   assert_equals(cacheText, 'intercepted', 'cache.add intercepted');
@@ -42,8 +42,8 @@ promise_test(async t => {
 promise_test(async t => {
   const iframe = await registerSwAndOpenFrame(t);
   const [fetchText, cacheText] = await Promise.all([
-    iframe.contentWindow.fetch('dummy.txt-inner-fetch').then(r => r.text()),
-    iframe.contentWindow.fetch('dummy.txt-inner-cache').then(r => r.text())
+    iframe.contentWindow.fetch('sample.txt-inner-fetch').then(r => r.text()),
+    iframe.contentWindow.fetch('sample.txt-inner-cache').then(r => r.text())
   ]);
   assert_equals(fetchText, 'Hello world\n', 'fetch within SW not intercepted');
   assert_equals(cacheText, 'Hello world\n',
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-base-url.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-base-url.https.html
index a08e0c74881..467a66cee46 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-base-url.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-base-url.https.html
@@ -70,13 +70,13 @@ const cssFile = 'fetch-request-css-base-url-style.css';
 
 base_url_test({
   framePath: SCOPE + '?fetch',
-  expectImageRequestPath: 'resources/dummy.png',
+  expectImageRequestPath: 'resources/sample.png',
   expectImageRequestReferrer: `resources/${cssFile}?fetch`,
   description: 'base URL when service worker does respondWith(fetch(responseUrl)).'});
 
 base_url_test({
   framePath: SCOPE + '?newResponse',
-  expectImageRequestPath: 'resources/request-url-path/dummy.png',
+  expectImageRequestPath: 'resources/request-url-path/sample.png',
   expectImageRequestReferrer: `resources/request-url-path/${cssFile}?newResponse`,
   description: 'base URL when service worker does respondWith(new Response()).'});
 
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-images.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-images.https.html
index 958de1af85f..586dea26135 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-images.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-css-images.https.html
@@ -9,9 +9,9 @@ var SCOPE = 'resources/fetch-request-resources-iframe.https.html';
 var SCRIPT = 'resources/fetch-request-resources-worker.js';
 var host_info = get_host_info();
 var LOCAL_URL =
-  host_info['HTTPS_ORIGIN'] + base_path() + 'resources/dummy?test';
+  host_info['HTTPS_ORIGIN'] + base_path() + 'resources/sample?test';
 var REMOTE_URL =
-  host_info['HTTPS_REMOTE_ORIGIN'] + base_path() + 'resources/dummy?test';
+  host_info['HTTPS_REMOTE_ORIGIN'] + base_path() + 'resources/sample?test';
 
 function css_image_test(expected_results, frame, url, type,
                         expected_mode, expected_credentials) {
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-redirect.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-redirect.https.html
index 57fb8eb4c95..5ce015b421f 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-redirect.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-redirect.https.html
@@ -63,7 +63,7 @@ promise_test(function(t) {
     var IMAGE_URL = base_path() + 'resources/square.png';
     var AUDIO_URL = getAudioURI("/media/sound_5");
     var XHR_URL = base_path() + 'resources/simple.txt';
-    var HTML_URL = base_path() + 'resources/dummy.html';
+    var HTML_URL = base_path() + 'resources/sample.html';
 
     var REDIRECT_TO_IMAGE_URL = REDIRECT_URL + encodeURIComponent(IMAGE_URL);
     var REDIRECT_TO_AUDIO_URL = REDIRECT_URL + encodeURIComponent(AUDIO_URL);
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-resources.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-resources.https.html
index 50864ca7895..b4680c3ccd5 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-resources.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/fetch-request-resources.https.html
@@ -162,9 +162,9 @@ promise_test(async t => {
   const SCRIPT = 'resources/fetch-request-resources-worker.js';
   const host_info = get_host_info();
   const LOCAL_URL =
-      host_info['HTTPS_ORIGIN'] + base_path() + 'resources/dummy?test';
+      host_info['HTTPS_ORIGIN'] + base_path() + 'resources/sample?test';
   const REMOTE_URL =
-      host_info['HTTPS_REMOTE_ORIGIN'] + base_path() + 'resources/dummy?test';
+      host_info['HTTPS_REMOTE_ORIGIN'] + base_path() + 'resources/sample?test';
 
   const registration =
       await service_worker_unregister_and_register(t, SCRIPT, SCOPE);
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/performance-timeline.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/performance-timeline.https.html
index 1fe19da53be..e56e6fe416f 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/performance-timeline.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/performance-timeline.https.html
@@ -12,7 +12,7 @@ service_worker_test(
 // is included in the Performance API's timing information.
 promise_test(t => {
   let script = 'resources/empty-but-slow-worker.js';
-  let scope = 'resources/dummy.txt?slow-sw-timing';
+  let scope = 'resources/sample.txt?slow-sw-timing';
   let url = new URL(scope, window.location).href;
   let slowURL = url + '&slow';
   let frame;
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/redirected-response.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/redirected-response.https.html
index 7262af36aba..d2c7858bedd 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/redirected-response.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/redirected-response.https.html
@@ -267,7 +267,7 @@ promise_test(t => setup_and_clean()
 promise_test(t => setup_and_clean()
     .then(() => {
       const url = host_info['HTTPS_ORIGIN'] + base_path() +
-                  'dummy?url=' + encodeURIComponent(TARGET_URL) +
+                  'sample?url=' + encodeURIComponent(TARGET_URL) +
                   '&original-redirect-mode=follow&sw=gen';
       return redirected_test({url: url,
                               fetch_option: {redirect: 'follow'},
@@ -281,7 +281,7 @@ promise_test(t => setup_and_clean()
 promise_test(t => setup_and_clean()
     .then(() => {
       const url = host_info['HTTPS_ORIGIN'] + base_path() +
-                  'dummy?url=' + encodeURIComponent(TARGET_URL) +
+                  'sample?url=' + encodeURIComponent(TARGET_URL) +
                   '&original-redirect-mode=error&sw=gen';
       return promise_rejects_js(
           t, frame.contentWindow.TypeError,
@@ -296,7 +296,7 @@ promise_test(t => setup_and_clean()
 promise_test(t => setup_and_clean()
     .then(() => {
       const url = host_info['HTTPS_ORIGIN'] + base_path() +
-                  'dummy?url=' + encodeURIComponent(TARGET_URL) +
+                  'sample?url=' + encodeURIComponent(TARGET_URL) +
                   '&original-redirect-mode=follow&sw=gen';
       return redirected_test({url: url,
                               fetch_option: {redirect: 'manual'},
@@ -319,7 +319,7 @@ promise_test(t => setup_and_clean()
       // So fetch can follow the redirect response 20 times.
       let urls = [TARGET_URL];
       for (let i = 0; i < 20; ++i) {
-        urls.unshift(host_info['HTTPS_ORIGIN'] + '/dummy?sw=gen&url=' +
+        urls.unshift(host_info['HTTPS_ORIGIN'] + '/sample?sw=gen&url=' +
                     encodeURIComponent(urls[0]));
 
       }
@@ -339,7 +339,7 @@ promise_test(t => setup_and_clean()
       // network error." https://fetch.spec.whatwg.org/#http-redirect-fetch
       // So fetch can't follow the redirect response 21 times.
       for (let i = 0; i < 21; ++i) {
-        urls.unshift(host_info['HTTPS_ORIGIN'] + '/dummy?sw=gen&url=' +
+        urls.unshift(host_info['HTTPS_ORIGIN'] + '/sample?sw=gen&url=' +
                     encodeURIComponent(urls[0]));
 
       }
@@ -360,7 +360,7 @@ promise_test(t => setup_and_clean()
 // =======================================================
 promise_test(t => setup_and_clean()
     .then(() => {
-      const url = host_info['HTTPS_ORIGIN'] + base_path() + 'dummy?url=' +
+      const url = host_info['HTTPS_ORIGIN'] + base_path() + 'sample?url=' +
                   encodeURIComponent(TARGET_URL) +'&sw=fetch-url';
       return redirected_test({url: url,
                               fetch_option: {},
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-updateviacache.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/registration-updateviacache.https.html
index b7b2b40d756..b2f6bbc6f84 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-updateviacache.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/registration-updateviacache.https.html
@@ -145,7 +145,7 @@
         }
 
         // Wait for all registration related tasks on |frame| to complete.
-        await wait_for_activation_on_dummy_scope(t, frame.contentWindow);
+        await wait_for_activation_on_sample_scope(t, frame.contentWindow);
         // The updateViaCache change should have been propagated to all
         // corresponding JS registration objects.
         assert_equals(reg_in_frame.updateViaCache, expected_updateViaCache, "reg_in_frame.updateViaCache updated");
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing.sub.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing.sub.https.html
index f2f81bc35a1..9808ae5ae1b 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing.sub.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing.sub.https.html
@@ -74,7 +74,7 @@ promise_test(async (t) => {
   const performance = frame.contentWindow.performance;
   verify({
     performance: performance,
-    resource: 'resources/dummy.js',
+    resource: 'resources/sample.js',
     mode: 'same-origin',
     description: 'Generated response',
   });
@@ -127,7 +127,7 @@ promise_test(async (t) => {
   });
   verify({
     performance: performance,
-    resource: 'resources/dummy.txt?SWFetched',
+    resource: 'resources/sample.txt?SWFetched',
     mode: 'same-origin',
     description: 'Resource fetched as response from missing.jpg?SWRespondsWithFetch.',
     should_no_performance_entry: true,
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-within-sw-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-within-sw-worker.js
index f3180d776c5..5903bab968d 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-within-sw-worker.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-event-within-sw-worker.js
@@ -5,20 +5,20 @@ addEventListener('fetch', event => {
 
   if (url.origin != location.origin) return;
 
-  if (url.pathname.endsWith('/dummy.txt')) {
+  if (url.pathname.endsWith('/sample.txt')) {
     event.respondWith(new Response('intercepted'));
     return;
   }
 
-  if (url.pathname.endsWith('/dummy.txt-inner-fetch')) {
-    event.respondWith(fetch('dummy.txt'));
+  if (url.pathname.endsWith('/sample.txt-inner-fetch')) {
+    event.respondWith(fetch('sample.txt'));
     return;
   }
 
-  if (url.pathname.endsWith('/dummy.txt-inner-cache')) {
+  if (url.pathname.endsWith('/sample.txt-inner-cache')) {
     event.respondWith(
       caches.open('test-inner-cache').then(cache =>
-        cache.add('dummy.txt').then(() => cache.match('dummy.txt'))
+        cache.add('sample.txt').then(() => cache.match('sample.txt'))
       )
     );
     return;
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html
index b6a260d066b..64a634e9db7 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-inscope.html
@@ -15,7 +15,7 @@ function test1() {
     results += 'FAIL(1)';
     test2();
   };
-  img.src = './dummy?url=' +
+  img.src = './sample?url=' +
             encodeURIComponent(host_info['HTTPS_ORIGIN'] + image_path);
 }
 
@@ -29,7 +29,7 @@ function test2() {
     results += 'FAIL(2)';
     test3();
   };
-  img.src = './dummy?mode=no-cors&url=' +
+  img.src = './sample?mode=no-cors&url=' +
             encodeURIComponent(host_info['HTTPS_REMOTE_ORIGIN'] + image_path);
 }
 
@@ -43,7 +43,7 @@ function test3() {
   img.onerror = function() {
     test4();
   };
-  img.src = './dummy?mode=no-cors&url=' +
+  img.src = './sample?mode=no-cors&url=' +
             encodeURIComponent(host_info['HTTP_ORIGIN'] + image_path);
 }
 
@@ -57,7 +57,7 @@ function test4() {
   img.onerror = function() {
     finish();
   };
-  img.src = './dummy?mode=no-cors&url=' +
+  img.src = './sample?mode=no-cors&url=' +
             encodeURIComponent(host_info['HTTP_REMOTE_ORIGIN'] + image_path);
 }
 
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html
index b8c940c2a0a..be0b5c8f561 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-mixed-content-iframe-inscope-to-outscope.html
@@ -67,7 +67,7 @@ function test5() {
     results += 'FAIL(5)';
     finish();
   };
-  img.src = './dummy?generate-png';
+  img.src = './sample?generate-png';
 }
 
 function finish() {
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-base-url-style.css b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-base-url-style.css
index 7643f667adb..f14fcaae727 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-base-url-style.css
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-base-url-style.css
@@ -1 +1 @@
-body { background-image: url("./dummy.png");}
+body { background-image: url("./sample.png");}
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-base-url-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-base-url-worker.js
index e8dbd2725c6..10d3b188093 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-base-url-worker.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-css-base-url-worker.js
@@ -23,7 +23,7 @@ self.addEventListener('fetch', event => {
     }
     // Respond with new Response().
     else if (url.search == '?newResponse') {
-      const styleString = 'body { background-image: url("./dummy.png");}';
+      const styleString = 'body { background-image: url("./sample.png");}';
       const headers = {'content-type': 'text/css'};
       event.respondWith(new Response(styleString, headers));
     }
@@ -31,7 +31,7 @@ self.addEventListener('fetch', event => {
 
   // The image request indicates what the base URL of the CSS was. Message the
   // result back to the test page.
-  else if (url.pathname.indexOf('dummy.png') != -1) {
+  else if (url.pathname.indexOf('sample.png') != -1) {
     // For some reason |source| is undefined here when running the test manually
     // in Firefox. The test author experimented with both using Client
     // (event.source) and MessagePort to try to get the test to pass, but
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-html-imports-iframe.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-html-imports-iframe.html
index 795185944e9..07a084257a8 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-html-imports-iframe.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-html-imports-iframe.html
@@ -8,6 +8,6 @@
       link.href = url;
       document.documentElement.appendChild(link);
     };
-  makeLink('same', hostInfo.HTTPS_ORIGIN + '/dummy-dir/same.html');
-  makeLink('other', hostInfo.HTTPS_REMOTE_ORIGIN + '/dummy-dir/other.html');
+  makeLink('same', hostInfo.HTTPS_ORIGIN + '/sample-dir/same.html');
+  makeLink('other', hostInfo.HTTPS_REMOTE_ORIGIN + '/sample-dir/other.html');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-html-imports-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-html-imports-worker.js
index 5525d526866..110727bd52c 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-html-imports-worker.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-html-imports-worker.js
@@ -3,27 +3,27 @@ var host_info = get_host_info();
 
 self.addEventListener('fetch', function(event) {
     var url = event.request.url;
-    if (url.indexOf('dummy-dir') == -1) {
+    if (url.indexOf('sample-dir') == -1) {
       return;
     }
     var result = 'mode=' + event.request.mode +
       ' credentials=' + event.request.credentials;
-    if (url == host_info.HTTPS_ORIGIN + '/dummy-dir/same.html') {
+    if (url == host_info.HTTPS_ORIGIN + '/sample-dir/same.html') {
       event.respondWith(new Response(
         result +
         '<link id="same-same" rel="import" ' +
-        'href="' + host_info.HTTPS_ORIGIN + '/dummy-dir/same-same.html">' +
+        'href="' + host_info.HTTPS_ORIGIN + '/sample-dir/same-same.html">' +
         '<link id="same-other" rel="import" ' +
         ' href="' + host_info.HTTPS_REMOTE_ORIGIN +
-        '/dummy-dir/same-other.html">'));
-    } else if (url == host_info.HTTPS_REMOTE_ORIGIN + '/dummy-dir/other.html') {
+        '/sample-dir/same-other.html">'));
+    } else if (url == host_info.HTTPS_REMOTE_ORIGIN + '/sample-dir/other.html') {
       event.respondWith(new Response(
         result +
         '<link id="other-same" rel="import" ' +
-        ' href="' + host_info.HTTPS_ORIGIN + '/dummy-dir/other-same.html">' +
+        ' href="' + host_info.HTTPS_ORIGIN + '/sample-dir/other-same.html">' +
         '<link id="other-other" rel="import" ' +
         ' href="' + host_info.HTTPS_REMOTE_ORIGIN +
-        '/dummy-dir/other-other.html">'));
+        '/sample-dir/other-other.html">'));
     } else {
       event.respondWith(new Response(result));
     }
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-resources-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-resources-worker.js
index 5c9e86d6684..983cccb8db7 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-resources-worker.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-resources-worker.js
@@ -11,7 +11,7 @@ self.onmessage = e => {
 
 self.addEventListener('fetch', e => {
   const url = e.request.url;
-  if (!url.includes('dummy?test')) {
+  if (!url.includes('sample?test')) {
     return;
   }
   port.postMessage({
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html
index 4e8116c0c41..b3ddec1a701 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-iframe.https.html
@@ -32,7 +32,7 @@ function xhr_send(url_base, method, data, with_credentials) {
       if (with_credentials) {
         xhr.withCredentials = true;
       }
-      xhr.open(method, url_base + '/dummy?test', true);
+      xhr.open(method, url_base + '/sample?test', true);
       xhr.send(data);
     });
 }
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-worker.js
index 91b3abb14d9..4e428374bc2 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-worker.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-request-xhr-worker.js
@@ -1,6 +1,6 @@
 self.addEventListener('fetch', function(event) {
     var url = event.request.url;
-    if (url.indexOf('dummy?test') == -1) {
+    if (url.indexOf('sample?test') == -1) {
       return;
     }
     event.respondWith(new Promise(function(resolve) {
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response-xhr-iframe.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response-xhr-iframe.https.html
index 612c9341eb7..c26eebee49d 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response-xhr-iframe.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response-xhr-iframe.https.html
@@ -13,7 +13,7 @@ function xhr_send(method, data) {
         reject('XHR should succeed.');
       };
       xhr.responseType = 'text';
-      xhr.open(method, './dummy?test', true);
+      xhr.open(method, './sample?test', true);
       xhr.send(data);
     });
 }
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response-xhr-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response-xhr-worker.js
index 465fbc91baa..0301b12c18a 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response-xhr-worker.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/fetch-response-xhr-worker.js
@@ -1,6 +1,6 @@
 self.addEventListener('fetch', function(event) {
     var url = event.request.url;
-    if (url.indexOf('dummy?test') == -1) {
+    if (url.indexOf('sample?test') == -1) {
       return;
     }
     event.respondWith(new Promise(function(resolve) {
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-blobtype-iframe.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-blobtype-iframe.https.html
index 1e6cacb55d7..04a9cb515e0 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-blobtype-iframe.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-blobtype-iframe.https.html
@@ -14,7 +14,7 @@ function xhr_send(method, data) {
         reject('XHR must succeed.');
       };
       xhr.responseType = 'text';
-      xhr.open(method, './dummy?test', true);
+      xhr.open(method, './sample?test', true);
       xhr.send(data);
     });
 }
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-blobtype-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-blobtype-worker.js
index 93f496ef44e..865dc30d428 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-blobtype-worker.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-blobtype-worker.js
@@ -1,6 +1,6 @@
 self.addEventListener('fetch', function(event) {
     var url = event.request.url;
-    if (url.indexOf('dummy?test') == -1) {
+    if (url.indexOf('sample?test') == -1) {
       return;
     }
     event.respondWith(new Promise(function(resolve) {
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-header-iframe.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-header-iframe.https.html
index 80531b79db9..8f0e6baca17 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-header-iframe.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-header-iframe.https.html
@@ -11,7 +11,7 @@ function xhr_send(method, data) {
         resolve();
       };
       xhr.responseType = 'text';
-      xhr.open(method, './dummy?test', true);
+      xhr.open(method, './sample?test', true);
       xhr.send(data);
     });
 }
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-header-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-header-worker.js
index 31e7f29d06f..850874b8116 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-header-worker.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/invalid-header-worker.js
@@ -1,6 +1,6 @@
 self.addEventListener('fetch', function(event) {
     var url = event.request.url;
-    if (url.indexOf('dummy?test') == -1) {
+    if (url.indexOf('sample?test') == -1) {
       return;
     }
     event.respondWith(new Promise(function(resolve) {
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/iso-latin1-header-iframe.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/iso-latin1-header-iframe.html
index 90e3f698cfa..cf2fa8d14f7 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/iso-latin1-header-iframe.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/iso-latin1-header-iframe.html
@@ -9,7 +9,7 @@ function xhr_send(method, data) {
         reject('XHR must succeed.');
       };
       xhr.responseType = 'text';
-      xhr.open(method, './dummy?test', true);
+      xhr.open(method, './sample?test', true);
       xhr.send(data);
     });
 }
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/iso-latin1-header-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/iso-latin1-header-worker.js
index 3ab5c7e7318..d9ecca277b3 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/iso-latin1-header-worker.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/iso-latin1-header-worker.js
@@ -1,6 +1,6 @@
 self.addEventListener('fetch', function(event) {
     var url = event.request.url;
-    if (url.indexOf('dummy?test') == -1) {
+    if (url.indexOf('sample?test') == -1) {
       return;
     }
 
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/local-url-inherit-controller-frame.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/local-url-inherit-controller-frame.html
index b331f88d471..5520c3a31bf 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/local-url-inherit-controller-frame.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/local-url-inherit-controller-frame.html
@@ -2,7 +2,7 @@
 <html>
 <script>
 
-const fetchURL = new URL('dummy.txt', window.location).href;
+const fetchURL = new URL('sample.txt', window.location).href;
 
 const frameControllerText =
 `<script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/local-url-inherit-controller-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/local-url-inherit-controller-worker.js
index 9d8955f111f..4b7aad0f58a 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/local-url-inherit-controller-worker.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/local-url-inherit-controller-worker.js
@@ -1,5 +1,5 @@
 addEventListener('fetch', evt => {
-  if (evt.request.url.includes('dummy')) {
+  if (evt.request.url.includes('sample')) {
     evt.respondWith(new Response('intercepted'));
   }
 });
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/performance-timeline-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/performance-timeline-worker.js
index cac327c34bf..6c6dfcbd281 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/performance-timeline-worker.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/performance-timeline-worker.js
@@ -30,12 +30,12 @@ promise_test(function(test) {
   }, 'User Timing');
 
 promise_test(function(test) {
-    return fetch('dummy.txt')
+    return fetch('sample.txt')
       .then(function(resp) {
           return resp.text();
         })
       .then(function(text) {
-          var expectedResources = ['testharness.js', 'dummy.txt'];
+          var expectedResources = ['testharness.js', 'sample.txt'];
           assert_equals(performance.getEntriesByType('resource').length, expectedResources.length);
           for (var i = 0; i < expectedResources.length; i++) {
               var entry = performance.getEntriesByType('resource')[i];
@@ -49,7 +49,7 @@ promise_test(function(test) {
                 resolve('bufferfull');
               }
               performance.setResourceTimingBufferSize(expectedResources.length);
-              fetch('dummy.txt');
+              fetch('sample.txt');
           });
         })
       .then(function(result) {
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/resource-timing-iframe.sub.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/resource-timing-iframe.sub.html
index 41bc2e77c1b..384c29b536b 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/resource-timing-iframe.sub.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/resource-timing-iframe.sub.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <script src="empty.js"></script>
-<script src="dummy.js"></script>
+<script src="sample.js"></script>
 <script src="redirect.py?Redirect=empty.js"></script>
 <img src="square.png">
 <img src="https://{{hosts[alt][]}}:{{ports[https][0]}}/service-workers/service-worker/resources/square.png">
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/resource-timing-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/resource-timing-worker.js
index 5bc6ef34748..b74e8cd6a23 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/resource-timing-worker.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/resource-timing-worker.js
@@ -1,5 +1,5 @@
 self.addEventListener('fetch', function(event) {
-  if (event.request.url.indexOf('dummy.js') != -1) {
+  if (event.request.url.indexOf('sample.js') != -1) {
     event.respondWith(new Promise(resolve => {
       // Slightly delay the response so we ensure we get a non-zero
       // duration.
@@ -7,6 +7,6 @@ self.addEventListener('fetch', function(event) {
     }));
   }
   else if (event.request.url.indexOf('missing.jpg?SWRespondsWithFetch') != -1) {
-    event.respondWith(fetch('dummy.txt?SWFetched'));
+    event.respondWith(fetch('sample.txt?SWFetched'));
   }
 });
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/dummy-worker-interceptor.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/sample-worker-interceptor.js
similarity index 100%
rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/dummy-worker-interceptor.js
rename to tests/wpt/web-platform-tests/service-workers/service-worker/resources/sample-worker-interceptor.js
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/dummy.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/sample.html
similarity index 100%
rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/dummy.html
rename to tests/wpt/web-platform-tests/service-workers/service-worker/resources/sample.html
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/dummy.txt b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/sample.txt
similarity index 100%
rename from tests/wpt/web-platform-tests/service-workers/service-worker/resources/dummy.txt
rename to tests/wpt/web-platform-tests/service-workers/service-worker/resources/sample.txt
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js
index 38840b75303..3f6a2055f68 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js
@@ -284,13 +284,13 @@ function with_sandboxed_iframe(url, sandbox) {
     });
 }
 
-// Registers, waits for activation, then unregisters on a dummy scope.
+// Registers, waits for activation, then unregisters on a sample scope.
 //
 // This can be used to wait for a period of time needed to register,
 // activate, and then unregister a service worker.  When checking that
 // certain behavior does *NOT* happen, this is preferable to using an
 // arbitrary delay.
-async function wait_for_activation_on_dummy_scope(t, window_or_workerglobalscope) {
+async function wait_for_activation_on_sample_scope(t, window_or_workerglobalscope) {
   const script = '/service-workers/service-worker/resources/empty-worker.js';
   const scope = 'resources/there/is/no/there/there?' + Date.now();
   let registration = await window_or_workerglobalscope.navigator.serviceWorker.register(script, { scope });
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/update-after-oneday.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/update-after-oneday.https.html
index d9b9fcfb8db..e7a8aa42d30 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/update-after-oneday.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/update-after-oneday.https.html
@@ -40,7 +40,7 @@ promise_test(function(t) {
         })
       .then(function() {
           // Trigger a non-navigation fetch event
-          frame.contentWindow.load_image(normalizeURL('resources/update/dummy'));
+          frame.contentWindow.load_image(normalizeURL('resources/update/sample'));
           return wait_for_update(t, registration);
        })
        .then(function() {
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/worker-interception.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/worker-interception.https.html
index 302a214ac61..eb79203a441 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/worker-interception.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/worker-interception.https.html
@@ -17,8 +17,8 @@ async function setup_service_worker(t, service_worker_url, scope) {
 }
 
 promise_test(async t => {
-  const worker_url = 'resources/dummy-synthesized-worker.js?dedicated';
-  const service_worker_url = 'resources/dummy-worker-interceptor.js';
+  const worker_url = 'resources/sample-synthesized-worker.js?dedicated';
+  const service_worker_url = 'resources/sample-worker-interceptor.js';
   const scope = worker_url;
 
   await setup_service_worker(t, service_worker_url, scope);
@@ -32,8 +32,8 @@ promise_test(async t => {
    `document is intercepted by worker's own service worker.`);
 
 promise_test(async t => {
-  const worker_url = 'resources/dummy-synthesized-worker.js?shared';
-  const service_worker_url = 'resources/dummy-worker-interceptor.js';
+  const worker_url = 'resources/sample-synthesized-worker.js?shared';
+  const service_worker_url = 'resources/sample-worker-interceptor.js';
   const scope = worker_url;
 
   await setup_service_worker(t, service_worker_url, scope);
@@ -47,8 +47,8 @@ promise_test(async t => {
    `document is intercepted by worker's own service worker.`);
 
 promise_test(async t => {
-  const worker_url = 'resources/dummy-same-origin-worker.js?dedicated';
-  const service_worker_url = 'resources/dummy-worker-interceptor.js';
+  const worker_url = 'resources/sample-same-origin-worker.js?dedicated';
+  const service_worker_url = 'resources/sample-worker-interceptor.js';
   const scope = worker_url;
 
   await setup_service_worker(t, service_worker_url, scope);
@@ -62,8 +62,8 @@ promise_test(async t => {
    'in starting a dedicated worker.');
 
 promise_test(async t => {
-  const worker_url = 'resources/dummy-same-origin-worker.js?shared';
-  const service_worker_url = 'resources/dummy-worker-interceptor.js';
+  const worker_url = 'resources/sample-same-origin-worker.js?shared';
+  const service_worker_url = 'resources/sample-worker-interceptor.js';
   const scope = worker_url;
 
   await setup_service_worker(t, service_worker_url, scope);
@@ -77,8 +77,8 @@ promise_test(async t => {
    'in starting a shared worker.');
 
 promise_test(async t => {
-  const worker_url = 'resources/dummy-cors-worker.js?dedicated';
-  const service_worker_url = 'resources/dummy-worker-interceptor.js';
+  const worker_url = 'resources/sample-cors-worker.js?dedicated';
+  const service_worker_url = 'resources/sample-worker-interceptor.js';
   const scope = worker_url;
 
   await setup_service_worker(t, service_worker_url, scope);
@@ -89,8 +89,8 @@ promise_test(async t => {
    'worker start.');
 
 promise_test(async t => {
-  const worker_url = 'resources/dummy-cors-worker.js?shared';
-  const service_worker_url = 'resources/dummy-worker-interceptor.js';
+  const worker_url = 'resources/sample-cors-worker.js?shared';
+  const service_worker_url = 'resources/sample-worker-interceptor.js';
   const scope = worker_url;
 
   await setup_service_worker(t, service_worker_url, scope);
@@ -101,8 +101,8 @@ promise_test(async t => {
    'worker start.');
 
 promise_test(async t => {
-  const worker_url = 'resources/dummy-no-cors-worker.js?dedicated';
-  const service_worker_url = 'resources/dummy-worker-interceptor.js';
+  const worker_url = 'resources/sample-no-cors-worker.js?dedicated';
+  const service_worker_url = 'resources/sample-worker-interceptor.js';
   const scope = worker_url;
 
   await setup_service_worker(t, service_worker_url, scope);
@@ -113,8 +113,8 @@ promise_test(async t => {
    'fails dedicated worker start.');
 
 promise_test(async t => {
-  const worker_url = 'resources/dummy-no-cors-worker.js?shared';
-  const service_worker_url = 'resources/dummy-worker-interceptor.js';
+  const worker_url = 'resources/sample-no-cors-worker.js?shared';
+  const service_worker_url = 'resources/sample-worker-interceptor.js';
   const scope = worker_url;
 
   await setup_service_worker(t, service_worker_url, scope);
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/xhr-response-url.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/xhr-response-url.https.html
index 1ad2ce3851c..673ca52cc67 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/xhr-response-url.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/xhr-response-url.https.html
@@ -30,7 +30,7 @@ promise_test(async (t) => {
 // worker.
 promise_test(async (t) => {
   // Build a URL that tells the service worker to respondWith(fetch(|target|)).
-  const target = new URL('resources/dummy.txt', window.location);
+  const target = new URL('resources/sample.txt', window.location);
   const url = build_url({
     respondWith: 'fetch',
     url: target
diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html b/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html
index d1fd9fc448a..a49e759ed4a 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html
@@ -137,14 +137,16 @@ test(() => {
 }, 'insertAdjacentHTML on element - not supported');
 
 test(() => {
-  document.write(`<div id=doc-write-1 style="display:none">${content}</div>`);
-  assert_dsd(document.getElementById('doc-write-1'),true);
+  const id = 'doc-write-1';
+  document.write(`<div id=${id} style="display:none">${content}</div>`);
+  assert_dsd(document.getElementById(id),true);
 }, 'document.write allowed from synchronous script loaded from main document');
 
 test(() => {
+  const id = 'doc-write-2';
   const doc = document.implementation.createHTMLDocument('');
-  doc.write(`<div id=doc-write-1>${content}</div>`);
-  assert_dsd(doc.getElementById('doc-write-1'),false);
+  doc.write(`<div id=${id}>${content}</div>`);
+  assert_dsd(doc.getElementById(id),false);
 }, 'document.write disallowed on fresh document');
 
 
diff --git a/tests/wpt/web-platform-tests/shadow-dom/nested-slot-remove-crash.html b/tests/wpt/web-platform-tests/shadow-dom/nested-slot-remove-crash.html
new file mode 100644
index 00000000000..3081dd6540f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/shadow-dom/nested-slot-remove-crash.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Mason Freed" href="mailto:masonfreed@chromium.org">
+<link rel="help" href="https://crbug.com/1159328">
+<meta name="assert" content="The renderer should not crash.">
+
+<div id="host"></div>
+<span>This test passes if the renderer does not crash.</span>
+
+<script>
+  const root = host.attachShadow({mode:"open"});
+  root.innerHTML = `
+    <slot id=outer1 name=outer>
+      <slot id=inner1 name=inner>Fallback</slot>
+    </slot>
+  `;
+  document.body.offsetTop;
+  // The renderer should not crash here:
+  root.querySelector("#outer1").remove();
+
+  root.innerHTML = `
+    <slot id=outer2>
+      <slot id=inner2>Fallback</slot>
+    </slot>
+  `;
+  document.body.offsetTop;
+  // The renderer should not crash here:
+  root.querySelector("#outer2").remove();
+
+  const root = host.attachShadow({mode:"open"});
+  root.innerHTML = `
+    <slot id=outer3>
+      <slot id=inner3>
+        <slot id=way-inner3>Fallback</slot>
+      </slot>
+    </slot>
+  `;
+  document.body.offsetTop;
+  // The renderer should not crash here:
+  root.querySelector("#outer3").remove();
+</script>
diff --git a/tests/wpt/web-platform-tests/tools/localpaths.py b/tests/wpt/web-platform-tests/tools/localpaths.py
index 87eafccf4d2..a79acb82a50 100644
--- a/tests/wpt/web-platform-tests/tools/localpaths.py
+++ b/tests/wpt/web-platform-tests/tools/localpaths.py
@@ -10,6 +10,7 @@ sys.path.insert(0, os.path.join(here, "third_party", "atomicwrites"))
 sys.path.insert(0, os.path.join(here, "third_party", "attrs", "src"))
 sys.path.insert(0, os.path.join(here, "third_party", "funcsigs"))
 sys.path.insert(0, os.path.join(here, "third_party", "html5lib"))
+sys.path.insert(0, os.path.join(here, "third_party", "zipp"))
 sys.path.insert(0, os.path.join(here, "third_party", "more-itertools"))
 sys.path.insert(0, os.path.join(here, "third_party", "packaging"))
 sys.path.insert(0, os.path.join(here, "third_party", "pathlib2"))
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/.flake8 b/tests/wpt/web-platform-tests/tools/third_party/zipp/.flake8
new file mode 100644
index 00000000000..790c109fdbe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/.flake8
@@ -0,0 +1,9 @@
+[flake8]
+max-line-length = 88
+ignore =
+	# W503 violates spec https://github.com/PyCQA/pycodestyle/issues/513
+	W503
+	# W504 has issues https://github.com/OCA/maintainer-quality-tools/issues/545
+	W504
+	# Black creates whitespace before colon
+	E203
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/.pre-commit-config.yaml b/tests/wpt/web-platform-tests/tools/third_party/zipp/.pre-commit-config.yaml
new file mode 100644
index 00000000000..922d94247a0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/.pre-commit-config.yaml
@@ -0,0 +1,5 @@
+repos:
+- repo: https://github.com/ambv/black
+  rev: 18.9b0
+  hooks:
+  - id: black
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/.readthedocs.yml b/tests/wpt/web-platform-tests/tools/third_party/zipp/.readthedocs.yml
new file mode 100644
index 00000000000..8ae4468428b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/.readthedocs.yml
@@ -0,0 +1,5 @@
+python:
+  version: 3
+  extra_requirements:
+    - docs
+  pip_install: true
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/.travis.yml b/tests/wpt/web-platform-tests/tools/third_party/zipp/.travis.yml
new file mode 100644
index 00000000000..b7d8f3ac9d6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/.travis.yml
@@ -0,0 +1,28 @@
+dist: xenial
+language: python
+
+python:
+- 2.7
+- 3.6
+- &latest_py3 3.8
+
+jobs:
+  fast_finish: true
+  include:
+  - stage: deploy
+    if: tag IS present
+    python: *latest_py3
+    before_script: skip
+    script: tox -e release
+
+cache: pip
+
+install:
+- pip install tox tox-venv
+
+before_script:
+  # Disable IPv6. Ref travis-ci/travis-ci#8361
+  - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then
+      sudo sh -c 'echo 0 > /proc/sys/net/ipv6/conf/all/disable_ipv6';
+    fi
+script: tox
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/CHANGES.rst b/tests/wpt/web-platform-tests/tools/third_party/zipp/CHANGES.rst
new file mode 100644
index 00000000000..a464a6324b7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/CHANGES.rst
@@ -0,0 +1,100 @@
+v1.2.0
+======
+
+#44: ``zipp.Path.open()`` now supports a compatible signature
+as ``pathlib.Path.open()``, accepting text (default) or binary
+modes and soliciting keyword parameters passed through to
+``io.TextIOWrapper`` (encoding, newline, etc). The stream is
+opened in text-mode by default now. ``open`` no
+longer accepts ``pwd`` as a positional argument and does not
+accept the ``force_zip64`` parameter at all. This change is
+a backward-incompatible change for that single function.
+
+v1.1.1
+======
+
+#43: Restored performance of implicit dir computation.
+
+v1.1.0
+======
+
+#32: For read-only zip files, complexity of ``.exists`` and
+``joinpath`` is now constant time instead of ``O(n)``, preventing
+quadratic time in common use-cases and rendering large
+zip files unusable for Path. Big thanks to Benjy Weinberger
+for the bug report and contributed fix (#33).
+
+v1.0.0
+======
+
+Re-release of 0.6 to correspond with release as found in
+Python 3.8.
+
+v0.6.0
+======
+
+#12: When adding implicit dirs, ensure that ancestral directories
+are added and that duplicates are excluded.
+
+The library now relies on
+`more_itertools <https://pypi.org/project/more_itertools>`_.
+
+v0.5.2
+======
+
+#7: Parent of a directory now actually returns the parent.
+
+v0.5.1
+======
+
+Declared package as backport.
+
+v0.5.0
+======
+
+Add ``.joinpath()`` method and ``.parent`` property.
+
+Now a backport release of the ``zipfile.Path`` class.
+
+v0.4.0
+======
+
+#4: Add support for zip files with implied directories.
+
+v0.3.3
+======
+
+#3: Fix issue where ``.name`` on a directory was empty.
+
+v0.3.2
+======
+
+#2: Fix TypeError on Python 2.7 when classic division is used.
+
+v0.3.1
+======
+
+#1: Fix TypeError on Python 3.5 when joining to a path-like object.
+
+v0.3.0
+======
+
+Add support for constructing a ``zipp.Path`` from any path-like
+object.
+
+``zipp.Path`` is now a new-style class on Python 2.7.
+
+v0.2.1
+======
+
+Fix issue with ``__str__``.
+
+v0.2.0
+======
+
+Drop reliance on future-fstrings.
+
+v0.1.0
+======
+
+Initial release with basic functionality.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/LICENSE b/tests/wpt/web-platform-tests/tools/third_party/zipp/LICENSE
new file mode 100644
index 00000000000..5e795a61f30
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/LICENSE
@@ -0,0 +1,7 @@
+Copyright Jason R. Coombs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/PKG-INFO b/tests/wpt/web-platform-tests/tools/third_party/zipp/PKG-INFO
new file mode 100644
index 00000000000..33ef1cf01c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/PKG-INFO
@@ -0,0 +1,39 @@
+Metadata-Version: 2.1
+Name: zipp
+Version: 1.2.0
+Summary: Backport of pathlib-compatible object wrapper for zip files
+Home-page: https://github.com/jaraco/zipp
+Author: Jason R. Coombs
+Author-email: jaraco@jaraco.com
+License: UNKNOWN
+Description: .. image:: https://img.shields.io/pypi/v/zipp.svg
+           :target: https://pypi.org/project/zipp
+        
+        .. image:: https://img.shields.io/pypi/pyversions/zipp.svg
+        
+        .. image:: https://img.shields.io/travis/jaraco/zipp/master.svg
+           :target: https://travis-ci.org/jaraco/zipp
+        
+        .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+           :target: https://github.com/ambv/black
+           :alt: Code style: Black
+        
+        .. image:: https://img.shields.io/appveyor/ci/jaraco/zipp/master.svg
+           :target: https://ci.appveyor.com/project/jaraco/zipp/branch/master
+        
+        .. .. image:: https://readthedocs.org/projects/zipp/badge/?version=latest
+        ..    :target: https://zipp.readthedocs.io/en/latest/?badge=latest
+        
+        
+        A pathlib-compatible Zipfile object wrapper. A backport of the
+        `Path object <https://docs.python.org/3.8/library/zipfile.html#path-objects>`_.
+        
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=2.7
+Provides-Extra: testing
+Provides-Extra: docs
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/README.rst b/tests/wpt/web-platform-tests/tools/third_party/zipp/README.rst
new file mode 100644
index 00000000000..ce128a32ba3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/README.rst
@@ -0,0 +1,21 @@
+.. image:: https://img.shields.io/pypi/v/zipp.svg
+   :target: https://pypi.org/project/zipp
+
+.. image:: https://img.shields.io/pypi/pyversions/zipp.svg
+
+.. image:: https://img.shields.io/travis/jaraco/zipp/master.svg
+   :target: https://travis-ci.org/jaraco/zipp
+
+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+   :target: https://github.com/ambv/black
+   :alt: Code style: Black
+
+.. image:: https://img.shields.io/appveyor/ci/jaraco/zipp/master.svg
+   :target: https://ci.appveyor.com/project/jaraco/zipp/branch/master
+
+.. .. image:: https://readthedocs.org/projects/zipp/badge/?version=latest
+..    :target: https://zipp.readthedocs.io/en/latest/?badge=latest
+
+
+A pathlib-compatible Zipfile object wrapper. A backport of the
+`Path object <https://docs.python.org/3.8/library/zipfile.html#path-objects>`_.
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/appveyor.yml b/tests/wpt/web-platform-tests/tools/third_party/zipp/appveyor.yml
new file mode 100644
index 00000000000..f35aa27d684
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/appveyor.yml
@@ -0,0 +1,24 @@
+environment:
+
+  APPVEYOR: true
+
+  matrix:
+    - PYTHON: "C:\\Python36-x64"
+    - PYTHON: "C:\\Python27-x64"
+
+install:
+  # symlink python from a directory with a space
+  - "mklink /d \"C:\\Program Files\\Python\" %PYTHON%"
+  - "SET PYTHON=\"C:\\Program Files\\Python\""
+  - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+
+build: off
+
+cache:
+  - '%LOCALAPPDATA%\pip\Cache'
+
+test_script:
+  - "python -m pip install -U tox tox-venv virtualenv"
+  - "tox"
+
+version: '{build}'
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/conftest.py b/tests/wpt/web-platform-tests/tools/third_party/zipp/conftest.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/docs/conf.py b/tests/wpt/web-platform-tests/tools/third_party/zipp/docs/conf.py
new file mode 100644
index 00000000000..41b53557fb2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/docs/conf.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+extensions = ['sphinx.ext.autodoc', 'jaraco.packaging.sphinx', 'rst.linker']
+
+master_doc = "index"
+
+link_files = {
+    '../CHANGES.rst': dict(
+        using=dict(GH='https://github.com'),
+        replace=[
+            dict(
+                pattern=r'(Issue #|\B#)(?P<issue>\d+)',
+                url='{package_url}/issues/{issue}',
+            ),
+            dict(
+                pattern=r'^(?m)((?P<scm_version>v?\d+(\.\d+){1,2}))\n[-=]+\n',
+                with_scm='{text}\n{rev[timestamp]:%d %b %Y}\n',
+            ),
+            dict(
+                pattern=r'PEP[- ](?P<pep_number>\d+)',
+                url='https://www.python.org/dev/peps/pep-{pep_number:0>4}/',
+            ),
+        ],
+    )
+}
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/docs/history.rst b/tests/wpt/web-platform-tests/tools/third_party/zipp/docs/history.rst
new file mode 100644
index 00000000000..8e217503ba1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/docs/history.rst
@@ -0,0 +1,8 @@
+:tocdepth: 2
+
+.. _changes:
+
+History
+*******
+
+.. include:: ../CHANGES (links).rst
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/docs/index.rst b/tests/wpt/web-platform-tests/tools/third_party/zipp/docs/index.rst
new file mode 100644
index 00000000000..ff49bf9dc70
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/docs/index.rst
@@ -0,0 +1,22 @@
+Welcome to zipp documentation!
+========================================
+
+.. toctree::
+   :maxdepth: 1
+
+   history
+
+
+.. automodule:: zipp
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/pyproject.toml b/tests/wpt/web-platform-tests/tools/third_party/zipp/pyproject.toml
new file mode 100644
index 00000000000..3afc8c33b78
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/pyproject.toml
@@ -0,0 +1,6 @@
+[build-system]
+requires = ["setuptools>=34.4", "wheel", "setuptools_scm>=1.15"]
+build-backend = "setuptools.build_meta"
+
+[tool.black]
+skip-string-normalization = true
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/setup.cfg b/tests/wpt/web-platform-tests/tools/third_party/zipp/setup.cfg
new file mode 100644
index 00000000000..ef4abd248a4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/setup.cfg
@@ -0,0 +1,45 @@
+[bdist_wheel]
+universal = 1
+
+[metadata]
+license_file = LICENSE
+name = zipp
+author = Jason R. Coombs
+author_email = jaraco@jaraco.com
+description = Backport of pathlib-compatible object wrapper for zip files
+long_description = file:README.rst
+url = https://github.com/jaraco/zipp
+classifiers = 
+	Development Status :: 5 - Production/Stable
+	Intended Audience :: Developers
+	License :: OSI Approved :: MIT License
+	Programming Language :: Python :: 2.7
+	Programming Language :: Python :: 3
+
+[options]
+py_modules = zipp
+packages = find:
+include_package_data = true
+python_requires = >=2.7
+install_requires = 
+	contextlib2; python_version < "3.4"
+setup_requires = setuptools_scm >= 1.15.0
+
+[options.extras_require]
+testing = 
+	
+	pathlib2
+	unittest2
+	jaraco.itertools
+	func-timeout
+docs = 
+	sphinx
+	jaraco.packaging >= 3.2
+	rst.linker >= 1.9
+
+[options.entry_points]
+
+[egg_info]
+tag_build = 
+tag_date = 0
+
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/setup.py b/tests/wpt/web-platform-tests/tools/third_party/zipp/setup.py
new file mode 100644
index 00000000000..827e955fcd6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/setup.py
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+
+import setuptools
+
+if __name__ == "__main__":
+    setuptools.setup(use_scm_version=True)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/skeleton.md b/tests/wpt/web-platform-tests/tools/third_party/zipp/skeleton.md
new file mode 100644
index 00000000000..52b97f09b41
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/skeleton.md
@@ -0,0 +1,137 @@
+# Overview
+
+This project is merged with [skeleton](https://github.com/jaraco/skeleton). What is skeleton? It's the scaffolding of a Python project jaraco [introduced in his blog](https://blog.jaraco.com/a-project-skeleton-for-python-projects/). It seeks to provide a means to re-use techniques and inherit advances when managing projects for distribution.
+
+## An SCM Managed Approach
+
+While maintaining dozens of projects in PyPI, jaraco derives best practices for project distribution and publishes them in the [skeleton repo](https://github.com/jaraco/skeleton), a git repo capturing the evolution and culmination of these best practices.
+
+It's intended to be used by a new or existing project to adopt these practices and honed and proven techniques. Adopters are encouraged to use the project directly and maintain a small deviation from the technique, make their own fork for more substantial changes unique to their environment or preferences, or simply adopt the skeleton once and abandon it thereafter.
+
+The primary advantage to using an SCM for maintaining these techniques is that those tools help facilitate the merge between the template and its adopting projects.
+
+Another advantage to using an SCM-managed approach is that tools like GitHub recognize that a change in the skeleton is the _same change_ across all projects that merge with that skeleton. Without the ancestry, with a traditional copy/paste approach, a [commit like this](https://github.com/jaraco/skeleton/commit/12eed1326e1bc26ce256e7b3f8cd8d3a5beab2d5) would produce notifications in the upstream project issue for each and every application, but because it's centralized, GitHub provides just the one notification when the change is added to the skeleton.
+
+# Usage
+
+## new projects
+
+To use skeleton for a new project, simply pull the skeleton into a new project:
+
+```
+$ git init my-new-project
+$ cd my-new-project
+$ git pull gh://jaraco/skeleton
+```
+
+Now customize the project to suit your individual project needs.
+
+## existing projects
+
+If you have an existing project, you can still incorporate the skeleton by merging it into the codebase.
+
+```
+$ git merge skeleton --allow-unrelated-histories
+```
+
+The `--allow-unrelated-histories` is necessary because the history from the skeleton was previously unrelated to the existing codebase. Resolve any merge conflicts and commit to the master, and now the project is based on the shared skeleton.
+
+## Updating
+
+Whenever a change is needed or desired for the general technique for packaging, it can be made in the skeleton project and then merged into each of the derived projects as needed, recommended before each release. As a result, features and best practices for packaging are centrally maintained and readily trickle into a whole suite of packages. This technique lowers the amount of tedious work necessary to create or maintain a project, and coupled with other techniques like continuous integration and deployment, lowers the cost of creating and maintaining refined Python projects to just a few, familiar git operations.
+
+Thereafter, the target project can make whatever customizations it deems relevant to the scaffolding. The project may even at some point decide that the divergence is too great to merit renewed merging with the original skeleton. This approach applies maximal guidance while creating minimal constraints.
+
+# Features
+
+The features/techniques employed by the skeleton include:
+
+- PEP 517/518 based build relying on setuptools as the build tool
+- setuptools declarative configuration using setup.cfg
+- tox for running tests
+- A README.rst as reStructuredText with some popular badges, but with readthedocs and appveyor badges commented out
+- A CHANGES.rst file intended for publishing release notes about the project
+- Use of [black](https://black.readthedocs.io/en/stable/) for code formatting (disabled on unsupported Python 3.5 and earlier)
+
+## Packaging Conventions
+
+A pyproject.toml is included to enable PEP 517 and PEP 518 compatibility and declares the requirements necessary to build the project on setuptools (a minimum version compatible with setup.cfg declarative config).
+
+The setup.cfg file implements the following features:
+
+- Assumes universal wheel for release
+- Advertises the project's LICENSE file (MIT by default)
+- Reads the README.rst file into the long description
+- Some common Trove classifiers
+- Includes all packages discovered in the repo
+- Data files in the package are also included (not just Python files)
+- Declares the required Python versions
+- Declares install requirements (empty by default)
+- Declares setup requirements for legacy environments
+- Supplies two 'extras':
+  - testing: requirements for running tests
+  - docs: requirements for building docs
+  - these extras split the declaration into "upstream" (requirements as declared by the skeleton) and "local" (those specific to the local project); these markers help avoid merge conflicts
+- Placeholder for defining entry points
+
+Additionally, the setup.py file declares `use_scm_version` which relies on [setuptools_scm](https://pypi.org/project/setuptools_scm) to do two things:
+
+- derive the project version from SCM tags
+- ensure that all files committed to the repo are automatically included in releases
+
+## Running Tests
+
+The skeleton assumes the developer has [tox](https://pypi.org/project/tox) installed. The developer is expected to run `tox` to run tests on the current Python version using [pytest](https://pypi.org/project/pytest).
+
+Other environments (invoked with `tox -e {name}`) supplied include:
+
+  - a `build-docs` environment to build the documentation
+  - a `release` environment to publish the package to PyPI
+
+A pytest.ini is included to define common options around running tests. In particular:
+
+- rely on default test discovery in the current directory
+- avoid recursing into common directories not containing tests
+- run doctests on modules and invoke flake8 tests
+- in doctests, allow unicode literals and regular literals to match, allowing for doctests to run on Python 2 and 3. Also enable ELLIPSES, a default that would be undone by supplying the prior option.
+- filters out known warnings caused by libraries/functionality included by the skeleton
+
+Relies a .flake8 file to correct some default behaviors:
+
+- disable mutually incompatible rules W503 and W504
+- support for black format
+
+## Continuous Integration
+
+The project is pre-configured to run tests in [Travis-CI](https://travis-ci.org) (.travis.yml). Any new project must be enabled either through their web site or with the `travis enable` command.
+
+Features include:
+- test against Python 2 and 3
+- run on Ubuntu Xenial
+- correct for broken IPv6
+
+Also provided is a minimal template for running under Appveyor (Windows).
+
+### Continuous Deployments
+
+In addition to running tests, an additional deploy stage is configured to automatically release tagged commits to PyPI using [API tokens](https://pypi.org/help/#apitoken). The release process expects an authorized token to be configured with Travis as the TWINE_PASSWORD environment variable. After the Travis project is created, configure the token through the web UI or with a command like the following (bash syntax):
+
+```
+TWINE_PASSWORD={token} travis env copy TWINE_PASSWORD
+```
+
+## Building Documentation
+
+Documentation is automatically built by [Read the Docs](https://readthedocs.org) when the project is registered with it, by way of the .readthedocs.yml file. To test the docs build manually, a tox env may be invoked as `tox -e build-docs`. Both techniques rely on the dependencies declared in `setup.cfg/options.extras_require.docs`.
+
+In addition to building the sphinx docs scaffolded in `docs/`, the docs build a `history.html` file that first injects release dates and hyperlinks into the CHANGES.rst before incorporating it as history in the docs.
+
+## Cutting releases
+
+By default, tagged commits are released through the continuous integration deploy stage.
+
+Releases may also be cut manually by invoking the tox environment `release` with the PyPI token set as the TWINE_PASSWORD:
+
+```
+TWINE_PASSWORD={token} tox -e release
+```
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/test_zipp.py b/tests/wpt/web-platform-tests/tools/third_party/zipp/test_zipp.py
new file mode 100644
index 00000000000..810d10bd68f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/test_zipp.py
@@ -0,0 +1,245 @@
+# coding: utf-8
+
+from __future__ import division, unicode_literals
+
+import io
+import zipfile
+import contextlib
+import tempfile
+import shutil
+import string
+
+try:
+    import pathlib
+except ImportError:
+    import pathlib2 as pathlib
+
+if not hasattr(contextlib, 'ExitStack'):
+    import contextlib2
+    contextlib.ExitStack = contextlib2.ExitStack
+
+try:
+    import unittest
+
+    unittest.TestCase.subTest
+except AttributeError:
+    import unittest2 as unittest
+
+import jaraco.itertools
+import func_timeout
+
+import zipp
+
+__metaclass__ = type
+consume = tuple
+
+
+def add_dirs(zf):
+    """
+    Given a writable zip file zf, inject directory entries for
+    any directories implied by the presence of children.
+    """
+    for name in zipp.CompleteDirs._implied_dirs(zf.namelist()):
+        zf.writestr(name, b"")
+    return zf
+
+
+def build_alpharep_fixture():
+    """
+    Create a zip file with this structure:
+
+    .
+    ├── a.txt
+    ├── b
+    │   ├── c.txt
+    │   ├── d
+    │   │   └── e.txt
+    │   └── f.txt
+    └── g
+        └── h
+            └── i.txt
+
+    This fixture has the following key characteristics:
+
+    - a file at the root (a)
+    - a file two levels deep (b/d/e)
+    - multiple files in a directory (b/c, b/f)
+    - a directory containing only a directory (g/h)
+
+    "alpha" because it uses alphabet
+    "rep" because it's a representative example
+    """
+    data = io.BytesIO()
+    zf = zipfile.ZipFile(data, "w")
+    zf.writestr("a.txt", b"content of a")
+    zf.writestr("b/c.txt", b"content of c")
+    zf.writestr("b/d/e.txt", b"content of e")
+    zf.writestr("b/f.txt", b"content of f")
+    zf.writestr("g/h/i.txt", b"content of i")
+    zf.filename = "alpharep.zip"
+    return zf
+
+
+@contextlib.contextmanager
+def temp_dir():
+    tmpdir = tempfile.mkdtemp()
+    try:
+        yield pathlib.Path(tmpdir)
+    finally:
+        shutil.rmtree(tmpdir)
+
+
+class TestPath(unittest.TestCase):
+    def setUp(self):
+        self.fixtures = contextlib.ExitStack()
+        self.addCleanup(self.fixtures.close)
+
+    def zipfile_alpharep(self):
+        with self.subTest():
+            yield build_alpharep_fixture()
+        with self.subTest():
+            yield add_dirs(build_alpharep_fixture())
+
+    def zipfile_ondisk(self):
+        tmpdir = pathlib.Path(self.fixtures.enter_context(temp_dir()))
+        for alpharep in self.zipfile_alpharep():
+            buffer = alpharep.fp
+            alpharep.close()
+            path = tmpdir / alpharep.filename
+            with path.open("wb") as strm:
+                strm.write(buffer.getvalue())
+            yield path
+
+    def test_iterdir_and_types(self):
+        for alpharep in self.zipfile_alpharep():
+            root = zipp.Path(alpharep)
+            assert root.is_dir()
+            a, b, g = root.iterdir()
+            assert a.is_file()
+            assert b.is_dir()
+            assert g.is_dir()
+            c, f, d = b.iterdir()
+            assert c.is_file() and f.is_file()
+            e, = d.iterdir()
+            assert e.is_file()
+            h, = g.iterdir()
+            i, = h.iterdir()
+            assert i.is_file()
+
+    def test_open(self):
+        for alpharep in self.zipfile_alpharep():
+            root = zipp.Path(alpharep)
+            a, b, g = root.iterdir()
+            with a.open() as strm:
+                data = strm.read()
+            assert data == "content of a"
+
+    def test_read(self):
+        for alpharep in self.zipfile_alpharep():
+            root = zipp.Path(alpharep)
+            a, b, g = root.iterdir()
+            assert a.read_text() == "content of a"
+            assert a.read_bytes() == b"content of a"
+
+    def test_joinpath(self):
+        for alpharep in self.zipfile_alpharep():
+            root = zipp.Path(alpharep)
+            a = root.joinpath("a")
+            assert a.is_file()
+            e = root.joinpath("b").joinpath("d").joinpath("e.txt")
+            assert e.read_text() == "content of e"
+
+    def test_traverse_truediv(self):
+        for alpharep in self.zipfile_alpharep():
+            root = zipp.Path(alpharep)
+            a = root / "a"
+            assert a.is_file()
+            e = root / "b" / "d" / "e.txt"
+            assert e.read_text() == "content of e"
+
+    def test_traverse_simplediv(self):
+        """
+        Disable the __future__.division when testing traversal.
+        """
+        for alpharep in self.zipfile_alpharep():
+            code = compile(
+                source="zipp.Path(alpharep) / 'a'",
+                filename="(test)",
+                mode="eval",
+                dont_inherit=True,
+            )
+            eval(code)
+
+    def test_pathlike_construction(self):
+        """
+        zipp.Path should be constructable from a path-like object
+        """
+        for zipfile_ondisk in self.zipfile_ondisk():
+            pathlike = pathlib.Path(str(zipfile_ondisk))
+            zipp.Path(pathlike)
+
+    def test_traverse_pathlike(self):
+        for alpharep in self.zipfile_alpharep():
+            root = zipp.Path(alpharep)
+            root / pathlib.Path("a")
+
+    def test_parent(self):
+        for alpharep in self.zipfile_alpharep():
+            root = zipp.Path(alpharep)
+            assert (root / 'a').parent.at == ''
+            assert (root / 'a' / 'b').parent.at == 'a/'
+
+    def test_dir_parent(self):
+        for alpharep in self.zipfile_alpharep():
+            root = zipp.Path(alpharep)
+            assert (root / 'b').parent.at == ''
+            assert (root / 'b/').parent.at == ''
+
+    def test_missing_dir_parent(self):
+        for alpharep in self.zipfile_alpharep():
+            root = zipp.Path(alpharep)
+            assert (root / 'missing dir/').parent.at == ''
+
+    def test_mutability(self):
+        """
+        If the underlying zipfile is changed, the Path object should
+        reflect that change.
+        """
+        for alpharep in self.zipfile_alpharep():
+            root = zipp.Path(alpharep)
+            a, b, g = root.iterdir()
+            alpharep.writestr('foo.txt', b'foo')
+            alpharep.writestr('bar/baz.txt', b'baz')
+            assert any(
+                child.name == 'foo.txt'
+                for child in root.iterdir())
+            assert (root / 'foo.txt').read_text() == 'foo'
+            baz, = (root / 'bar').iterdir()
+            assert baz.read_text() == 'baz'
+
+    HUGE_ZIPFILE_NUM_ENTRIES = 2 ** 13
+
+    def huge_zipfile(self):
+        """Create a read-only zipfile with a huge number of entries entries."""
+        strm = io.BytesIO()
+        zf = zipfile.ZipFile(strm, "w")
+        for entry in map(str, range(self.HUGE_ZIPFILE_NUM_ENTRIES)):
+            zf.writestr(entry, entry)
+        zf.mode = 'r'
+        return zf
+
+    def test_joinpath_constant_time(self):
+        """
+        Ensure joinpath on items in zipfile is linear time.
+        """
+        root = zipp.Path(self.huge_zipfile())
+        entries = jaraco.itertools.Counter(root.iterdir())
+        for entry in entries:
+            entry.joinpath('suffix')
+        # Check the file iterated all items
+        assert entries.count == self.HUGE_ZIPFILE_NUM_ENTRIES
+
+    @func_timeout.func_set_timeout(3)
+    def test_implied_dirs_performance(self):
+        data = ['/'.join(string.ascii_lowercase + str(n)) for n in range(10000)]
+        zipp.CompleteDirs._implied_dirs(data)
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/tox.ini b/tests/wpt/web-platform-tests/tools/third_party/zipp/tox.ini
new file mode 100644
index 00000000000..cb542c136c3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/tox.ini
@@ -0,0 +1,36 @@
+[tox]
+envlist = python
+minversion = 3.2
+# https://github.com/jaraco/skeleton/issues/6
+tox_pip_extensions_ext_venv_update = true
+
+[testenv]
+deps =
+	setuptools>=31.0.1
+commands =
+	python -m unittest discover
+usedevelop = True
+extras = testing
+
+[testenv:build-docs]
+extras =
+    docs
+    testing
+changedir = docs
+commands =
+    python -m sphinx . {toxinidir}/build/html
+
+[testenv:release]
+skip_install = True
+deps =
+	pep517>=0.5
+	twine>=1.13
+	path.py
+passenv =
+	TWINE_PASSWORD
+setenv =
+	TWINE_USERNAME = {env:TWINE_USERNAME:__token__}
+commands =
+	python -c "import path; path.Path('dist').rmtree_p()"
+	python -m pep517.build .
+	python -m twine upload dist/*
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/PKG-INFO b/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/PKG-INFO
new file mode 100644
index 00000000000..33ef1cf01c4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/PKG-INFO
@@ -0,0 +1,39 @@
+Metadata-Version: 2.1
+Name: zipp
+Version: 1.2.0
+Summary: Backport of pathlib-compatible object wrapper for zip files
+Home-page: https://github.com/jaraco/zipp
+Author: Jason R. Coombs
+Author-email: jaraco@jaraco.com
+License: UNKNOWN
+Description: .. image:: https://img.shields.io/pypi/v/zipp.svg
+           :target: https://pypi.org/project/zipp
+        
+        .. image:: https://img.shields.io/pypi/pyversions/zipp.svg
+        
+        .. image:: https://img.shields.io/travis/jaraco/zipp/master.svg
+           :target: https://travis-ci.org/jaraco/zipp
+        
+        .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+           :target: https://github.com/ambv/black
+           :alt: Code style: Black
+        
+        .. image:: https://img.shields.io/appveyor/ci/jaraco/zipp/master.svg
+           :target: https://ci.appveyor.com/project/jaraco/zipp/branch/master
+        
+        .. .. image:: https://readthedocs.org/projects/zipp/badge/?version=latest
+        ..    :target: https://zipp.readthedocs.io/en/latest/?badge=latest
+        
+        
+        A pathlib-compatible Zipfile object wrapper. A backport of the
+        `Path object <https://docs.python.org/3.8/library/zipfile.html#path-objects>`_.
+        
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=2.7
+Provides-Extra: testing
+Provides-Extra: docs
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/SOURCES.txt b/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/SOURCES.txt
new file mode 100644
index 00000000000..845b342cefc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/SOURCES.txt
@@ -0,0 +1,24 @@
+.flake8
+.pre-commit-config.yaml
+.readthedocs.yml
+.travis.yml
+CHANGES.rst
+LICENSE
+README.rst
+appveyor.yml
+conftest.py
+pyproject.toml
+setup.cfg
+setup.py
+skeleton.md
+test_zipp.py
+tox.ini
+zipp.py
+docs/conf.py
+docs/history.rst
+docs/index.rst
+zipp.egg-info/PKG-INFO
+zipp.egg-info/SOURCES.txt
+zipp.egg-info/dependency_links.txt
+zipp.egg-info/requires.txt
+zipp.egg-info/top_level.txt
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/dependency_links.txt b/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/dependency_links.txt
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/dependency_links.txt
@@ -0,0 +1 @@
+
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/requires.txt b/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/requires.txt
new file mode 100644
index 00000000000..90bab46ac49
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/requires.txt
@@ -0,0 +1,14 @@
+
+[:python_version < "3.4"]
+contextlib2
+
+[docs]
+sphinx
+jaraco.packaging>=3.2
+rst.linker>=1.9
+
+[testing]
+pathlib2
+unittest2
+jaraco.itertools
+func-timeout
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/top_level.txt b/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/top_level.txt
new file mode 100644
index 00000000000..e82f676f82a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.egg-info/top_level.txt
@@ -0,0 +1 @@
+zipp
diff --git a/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.py b/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.py
new file mode 100644
index 00000000000..892205834ab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/third_party/zipp/zipp.py
@@ -0,0 +1,286 @@
+# coding: utf-8
+
+from __future__ import division
+
+import io
+import sys
+import posixpath
+import zipfile
+import functools
+import itertools
+from collections import OrderedDict
+
+try:
+    from contextlib import suppress
+except ImportError:
+    from contextlib2 import suppress
+
+__metaclass__ = type
+
+
+def _parents(path):
+    """
+    Given a path with elements separated by
+    posixpath.sep, generate all parents of that path.
+
+    >>> list(_parents('b/d'))
+    ['b']
+    >>> list(_parents('/b/d/'))
+    ['/b']
+    >>> list(_parents('b/d/f/'))
+    ['b/d', 'b']
+    >>> list(_parents('b'))
+    []
+    >>> list(_parents(''))
+    []
+    """
+    return itertools.islice(_ancestry(path), 1, None)
+
+
+def _ancestry(path):
+    """
+    Given a path with elements separated by
+    posixpath.sep, generate all elements of that path
+
+    >>> list(_ancestry('b/d'))
+    ['b/d', 'b']
+    >>> list(_ancestry('/b/d/'))
+    ['/b/d', '/b']
+    >>> list(_ancestry('b/d/f/'))
+    ['b/d/f', 'b/d', 'b']
+    >>> list(_ancestry('b'))
+    ['b']
+    >>> list(_ancestry(''))
+    []
+    """
+    path = path.rstrip(posixpath.sep)
+    while path and path != posixpath.sep:
+        yield path
+        path, tail = posixpath.split(path)
+
+
+class CompleteDirs(zipfile.ZipFile):
+    """
+    A ZipFile subclass that ensures that implied directories
+    are always included in the namelist.
+    """
+
+    @staticmethod
+    def _implied_dirs(names):
+        parents = itertools.chain.from_iterable(map(_parents, names))
+        # Cast names to a set for O(1) lookups
+        existing = set(names)
+        # Deduplicate entries in original order
+        implied_dirs = OrderedDict.fromkeys(
+            p + posixpath.sep for p in parents
+            if p + posixpath.sep not in existing
+        )
+        return implied_dirs
+
+    def namelist(self):
+        names = super(CompleteDirs, self).namelist()
+        return names + list(self._implied_dirs(names))
+
+    def _name_set(self):
+        return set(self.namelist())
+
+    def resolve_dir(self, name):
+        """
+        If the name represents a directory, return that name
+        as a directory (with the trailing slash).
+        """
+        names = self._name_set()
+        dirname = name + '/'
+        dir_match = name not in names and dirname in names
+        return dirname if dir_match else name
+
+    @classmethod
+    def make(cls, source):
+        """
+        Given a source (filename or zipfile), return an
+        appropriate CompleteDirs subclass.
+        """
+        if isinstance(source, CompleteDirs):
+            return source
+
+        if not isinstance(source, zipfile.ZipFile):
+            return cls(_pathlib_compat(source))
+
+        # Only allow for FastPath when supplied zipfile is read-only
+        if 'r' not in source.mode:
+            cls = CompleteDirs
+
+        res = cls.__new__(cls)
+        vars(res).update(vars(source))
+        return res
+
+
+class FastLookup(CompleteDirs):
+    """
+    ZipFile subclass to ensure implicit
+    dirs exist and are resolved rapidly.
+    """
+    def namelist(self):
+        with suppress(AttributeError):
+            return self.__names
+        self.__names = super(FastLookup, self).namelist()
+        return self.__names
+
+    def _name_set(self):
+        with suppress(AttributeError):
+            return self.__lookup
+        self.__lookup = super(FastLookup, self)._name_set()
+        return self.__lookup
+
+
+def _pathlib_compat(path):
+    """
+    For path-like objects, convert to a filename for compatibility
+    on Python 3.6.1 and earlier.
+    """
+    try:
+        return path.__fspath__()
+    except AttributeError:
+        return str(path)
+
+
+class Path:
+    """
+    A pathlib-compatible interface for zip files.
+
+    Consider a zip file with this structure::
+
+        .
+        ├── a.txt
+        └── b
+            ├── c.txt
+            └── d
+                └── e.txt
+
+    >>> data = io.BytesIO()
+    >>> zf = zipfile.ZipFile(data, 'w')
+    >>> zf.writestr('a.txt', 'content of a')
+    >>> zf.writestr('b/c.txt', 'content of c')
+    >>> zf.writestr('b/d/e.txt', 'content of e')
+    >>> zf.filename = 'abcde.zip'
+
+    Path accepts the zipfile object itself or a filename
+
+    >>> root = Path(zf)
+
+    From there, several path operations are available.
+
+    Directory iteration (including the zip file itself):
+
+    >>> a, b = root.iterdir()
+    >>> a
+    Path('abcde.zip', 'a.txt')
+    >>> b
+    Path('abcde.zip', 'b/')
+
+    name property:
+
+    >>> b.name
+    'b'
+
+    join with divide operator:
+
+    >>> c = b / 'c.txt'
+    >>> c
+    Path('abcde.zip', 'b/c.txt')
+    >>> c.name
+    'c.txt'
+
+    Read text:
+
+    >>> c.read_text()
+    'content of c'
+
+    existence:
+
+    >>> c.exists()
+    True
+    >>> (b / 'missing.txt').exists()
+    False
+
+    Coercion to string:
+
+    >>> str(c)
+    'abcde.zip/b/c.txt'
+    """
+
+    __repr = "{self.__class__.__name__}({self.root.filename!r}, {self.at!r})"
+
+    def __init__(self, root, at=""):
+        self.root = FastLookup.make(root)
+        self.at = at
+
+    def open(self, mode='r', *args, **kwargs):
+        """
+        Open this entry as text or binary following the semantics
+        of ``pathlib.Path.open()`` by passing arguments through
+        to io.TextIOWrapper().
+        """
+        pwd = kwargs.pop('pwd', None)
+        zip_mode = mode[0]
+        stream = self.root.open(self.at, zip_mode, pwd=pwd)
+        if 'b' in mode:
+            if args or kwargs:
+                raise ValueError("encoding args invalid for binary operation")
+            return stream
+        return io.TextIOWrapper(stream, *args, **kwargs)
+
+    @property
+    def name(self):
+        return posixpath.basename(self.at.rstrip("/"))
+
+    def read_text(self, *args, **kwargs):
+        with self.open('r', *args, **kwargs) as strm:
+            return strm.read()
+
+    def read_bytes(self):
+        with self.open('rb') as strm:
+            return strm.read()
+
+    def _is_child(self, path):
+        return posixpath.dirname(path.at.rstrip("/")) == self.at.rstrip("/")
+
+    def _next(self, at):
+        return Path(self.root, at)
+
+    def is_dir(self):
+        return not self.at or self.at.endswith("/")
+
+    def is_file(self):
+        return not self.is_dir()
+
+    def exists(self):
+        return self.at in self.root._name_set()
+
+    def iterdir(self):
+        if not self.is_dir():
+            raise ValueError("Can't listdir a file")
+        subs = map(self._next, self.root.namelist())
+        return filter(self._is_child, subs)
+
+    def __str__(self):
+        return posixpath.join(self.root.filename, self.at)
+
+    def __repr__(self):
+        return self.__repr.format(self=self)
+
+    def joinpath(self, add):
+        next = posixpath.join(self.at, _pathlib_compat(add))
+        return self._next(self.root.resolve_dir(next))
+
+    __truediv__ = joinpath
+
+    @property
+    def parent(self):
+        parent_at = posixpath.dirname(self.at.rstrip('/'))
+        if parent_at:
+            parent_at += '/'
+        return self._next(parent_at)
+
+    if sys.version_info < (3,):
+        __div__ = __truediv__
diff --git a/tests/wpt/web-platform-tests/webrtc-extensions/META.yml b/tests/wpt/web-platform-tests/webrtc-extensions/META.yml
index 4ceee0664cb..be8cb028f08 100644
--- a/tests/wpt/web-platform-tests/webrtc-extensions/META.yml
+++ b/tests/wpt/web-platform-tests/webrtc-extensions/META.yml
@@ -1,3 +1,3 @@
-spec: https://henbos.github.io/webrtc-extensions/
+spec: https://w3c.github.io/webrtc-extensions/
 suggested_reviewers:
   - hbos
diff --git a/tests/wpt/web-platform-tests/x-frame-options/META.yml b/tests/wpt/web-platform-tests/x-frame-options/META.yml
index 21ef0699364..622213edadb 100644
--- a/tests/wpt/web-platform-tests/x-frame-options/META.yml
+++ b/tests/wpt/web-platform-tests/x-frame-options/META.yml
@@ -1,4 +1,4 @@
-spec: https://html.spec.whatwg.org/#the-x-frame-options-header
+spec: https://html.spec.whatwg.org/multipage/browsing-the-web.html#the-x-frame-options-header
 suggested_reviewers:
   - annevk
   - mikewest
diff --git a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
index 9a0698ac4f5..880676c6f4d 100644
--- a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
@@ -266,3 +266,12 @@
   [WebGL test #43: attachment 6 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,255,255,0]
     expected: FAIL
 
+  [WebGL test #42: attachment 5 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,255,0,255]
+    expected: FAIL
+
+  [WebGL test #40: attachment 3 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,42,0,0]
+    expected: FAIL
+
+  [WebGL test #48: attachment 3 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,42,0,0]
+    expected: FAIL
+