diff --git a/tests/wpt/metadata/2dcontext/imagebitmap/createImageBitmap-drawImage.html.ini b/tests/wpt/metadata/2dcontext/imagebitmap/createImageBitmap-drawImage.html.ini
index 5a201d2ecad..8db1ab505b6 100644
--- a/tests/wpt/metadata/2dcontext/imagebitmap/createImageBitmap-drawImage.html.ini
+++ b/tests/wpt/metadata/2dcontext/imagebitmap/createImageBitmap-drawImage.html.ini
@@ -1,11 +1,10 @@
 [createImageBitmap-drawImage.html]
   type: testharness
-  expected: TIMEOUT
   [createImageBitmap from a HTMLImageElement, and drawImage on the created ImageBitmap]
     expected: FAIL
 
   [createImageBitmap from a Blob, and drawImage on the created ImageBitmap]
-    expected: TIMEOUT
+    expected: FAIL
 
   [createImageBitmap from a HTMLCanvasElement, and drawImage on the created ImageBitmap]
     expected: FAIL
@@ -50,7 +49,7 @@
     expected: FAIL
 
   [createImageBitmap from a Blob with negative sw/sh, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a bitmap HTMLImageElement, and drawImage on the created ImageBitmap]
     expected: FAIL
@@ -173,11 +172,11 @@
     expected: FAIL
 
   [createImageBitmap from a Blob scaled down, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a Blob scaled up, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
   [createImageBitmap from a Blob resized, and drawImage on the created ImageBitmap]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index e430e5c3c97..3e5f358c817 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -118682,7 +118682,7 @@
      "/css/css-grid/alignment/grid-gutters-009.html",
      [
       [
-       "/css/css-grid/reference/grid-collapsed-row-gutters-ref.html",
+       "/css/css-grid/reference/grid-percentage-gap-ref.html",
        "=="
       ]
      ],
@@ -118694,7 +118694,7 @@
      "/css/css-grid/alignment/grid-gutters-010.html",
      [
       [
-       "/css/css-grid/reference/grid-collapsed-row-gutters-ref.html",
+       "/css/css-grid/reference/grid-percentage-gap-ref.html",
        "=="
       ]
      ],
@@ -185494,7 +185494,7 @@
      "/svg/extensibility/foreignObject/foreign-object-paints-before-rect.html",
      [
       [
-       "/svg/extensibility/foreignObject/foreign-object-paints-before-rect-expected.html",
+       "/svg/extensibility/foreignObject/foreign-object-paints-before-rect-ref.html",
        "=="
       ]
      ],
@@ -253059,11 +253059,6 @@
      {}
     ]
    ],
-   "css/css-grid/reference/grid-collapsed-row-gutters-ref.html": [
-    [
-     {}
-    ]
-   ],
    "css/css-grid/reference/grid-different-gutters-ref.html": [
     [
      {}
@@ -253109,6 +253104,11 @@
      {}
     ]
    ],
+   "css/css-grid/reference/grid-percentage-gap-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-grid/reference/grid-support-grid-auto-columns-rows-001-ref.html": [
     [
      {}
@@ -276794,6 +276794,16 @@
      {}
     ]
    ],
+   "feature-policy/experimental-features/resources/common.js": [
+    [
+     {}
+    ]
+   ],
+   "feature-policy/experimental-features/resources/document-stream-insertion.html": [
+    [
+     {}
+    ]
+   ],
    "feature-policy/experimental-features/resources/feature-policy-image.html": [
     [
      {}
@@ -277569,6 +277579,31 @@
      {}
     ]
    ],
+   "fetch/sec-metadata/README.md": [
+    [
+     {}
+    ]
+   ],
+   "fetch/sec-metadata/resources/echo-as-json.py": [
+    [
+     {}
+    ]
+   ],
+   "fetch/sec-metadata/resources/echo-as-script.py": [
+    [
+     {}
+    ]
+   ],
+   "fetch/sec-metadata/resources/helper.js": [
+    [
+     {}
+    ]
+   ],
+   "fetch/sec-metadata/resources/post-to-owner.py": [
+    [
+     {}
+    ]
+   ],
    "fetch/security/support/embedded-credential-window.sub.html": [
     [
      {}
@@ -290954,6 +290989,11 @@
      {}
     ]
    ],
+   "interfaces/battery.idl": [
+    [
+     {}
+    ]
+   ],
    "interfaces/budget-api.idl": [
     [
      {}
@@ -291154,6 +291194,11 @@
      {}
     ]
    ],
+   "interfaces/vibration.idl": [
+    [
+     {}
+    ]
+   ],
    "interfaces/wake-lock.idl": [
     [
      {}
@@ -299574,7 +299619,7 @@
      {}
     ]
    ],
-   "svg/extensibility/foreignObject/foreign-object-paints-before-rect-expected.html": [
+   "svg/extensibility/foreignObject/foreign-object-paints-before-rect-ref.html": [
     [
      {}
     ]
@@ -326689,6 +326734,12 @@
      {}
     ]
    ],
+   "css/cssom-view/elementsFromPoint-svg-text.html": [
+    [
+     "/css/cssom-view/elementsFromPoint-svg-text.html",
+     {}
+    ]
+   ],
    "css/cssom-view/elementsFromPoint-svg.html": [
     [
      "/css/cssom-view/elementsFromPoint-svg.html",
@@ -332699,6 +332750,12 @@
      }
     ]
    ],
+   "feature-policy/experimental-features/document-stream-insertion.tentative.html": [
+    [
+     "/feature-policy/experimental-features/document-stream-insertion.tentative.html",
+     {}
+    ]
+   ],
    "feature-policy/experimental-features/unsized-image.tentative.https.sub.html": [
     [
      "/feature-policy/experimental-features/unsized-image.tentative.https.sub.html",
@@ -334037,6 +334094,38 @@
      {}
     ]
    ],
+   "fetch/sec-metadata/fetch.tentative.https.sub.html": [
+    [
+     "/fetch/sec-metadata/fetch.tentative.https.sub.html",
+     {}
+    ]
+   ],
+   "fetch/sec-metadata/iframe.tentative.https.sub.html": [
+    [
+     "/fetch/sec-metadata/iframe.tentative.https.sub.html",
+     {}
+    ]
+   ],
+   "fetch/sec-metadata/img.tentative.https.sub.html": [
+    [
+     "/fetch/sec-metadata/img.tentative.https.sub.html",
+     {}
+    ]
+   ],
+   "fetch/sec-metadata/script.tentative.https.sub.html": [
+    [
+     "/fetch/sec-metadata/script.tentative.https.sub.html",
+     {}
+    ]
+   ],
+   "fetch/sec-metadata/window-open.tentative.https.sub.html": [
+    [
+     "/fetch/sec-metadata/window-open.tentative.https.sub.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
    "fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html": [
     [
      "/fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html",
@@ -334799,6 +334888,18 @@
      {}
     ]
    ],
+   "html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding-2.html": [
+    [
+     "/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding-2.html",
+     {}
+    ]
+   ],
+   "html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding.html": [
+    [
+     "/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding.html",
+     {}
+    ]
+   ],
    "html/browsers/browsing-the-web/scroll-to-fragid/replacement-enabled.html": [
     [
      "/html/browsers/browsing-the-web/scroll-to-fragid/replacement-enabled.html",
@@ -339747,6 +339848,12 @@
      {}
     ]
    ],
+   "html/semantics/embedded-content/media-elements/track/track-element/track-remove-track-inband.html": [
+    [
+     "/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track-inband.html",
+     {}
+    ]
+   ],
    "html/semantics/embedded-content/media-elements/track/track-element/track-remove-track.html": [
     [
      "/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track.html",
@@ -411549,7 +411656,7 @@
    "testharness"
   ],
   "battery-status/battery-interface-idlharness.https.html": [
-   "6782a2da1811570e601d44422c385bc33f97cd70",
+   "0390a5ad8de487a38e9b981ae61786c33c980222",
    "testharness"
   ],
   "battery-status/battery-plugging-in-manual.https.html": [
@@ -434645,7 +434752,7 @@
    "support"
   ],
   "cors/resources/cors-cookie.py": [
-   "ab7074e4617a011d87d65043c71d01e96461a10b",
+   "c130e870b243bb52823c676575721bf1fb48981b",
    "support"
   ],
   "cors/resources/cors-headers.asis": [
@@ -434669,7 +434776,7 @@
    "support"
   ],
   "cors/resources/status.py": [
-   "e1625a72475434c8efb1fddaa6f073379227fb59",
+   "fbcf78c5ee7c8dd4904de613017edf590f486766",
    "support"
   ],
   "cors/response-headers.htm": [
@@ -512281,11 +512388,11 @@
    "reftest"
   ],
   "css/css-grid/alignment/grid-gutters-009.html": [
-   "41a576cd5425e3b60efc328e06941e19c4d49369",
+   "d8fb96e69ca33f25e0d69dec345ca41e0cc68621",
    "reftest"
   ],
   "css/css-grid/alignment/grid-gutters-010.html": [
-   "5ed8d7a44153cd4833f893fe53849a1e63d1a583",
+   "7f54c79f5240a437a217208bf8c547abca49d443",
    "reftest"
   ],
   "css/css-grid/alignment/grid-gutters-011.html": [
@@ -513520,10 +513627,6 @@
    "a457a82d10d1cc8f2576b6732e68a7854737f63a",
    "support"
   ],
-  "css/css-grid/reference/grid-collapsed-row-gutters-ref.html": [
-   "15a431efb881d37ce24ab376ee3709bd4333bb11",
-   "support"
-  ],
   "css/css-grid/reference/grid-different-gutters-ref.html": [
    "bd1aecfb426cde332794b9657a7d7a905ff1b292",
    "support"
@@ -513560,6 +513663,10 @@
    "3ac4bb610d37d2d31a42e0e6bd86837c9f097b79",
    "support"
   ],
+  "css/css-grid/reference/grid-percentage-gap-ref.html": [
+   "9600489a8f1f24a5fdc9960c84965f4c4ccd7640",
+   "support"
+  ],
   "css/css-grid/reference/grid-support-grid-auto-columns-rows-001-ref.html": [
    "ff487f266aa067949899506059e19d4b8fbf429c",
    "support"
@@ -545416,6 +545523,10 @@
    "19a0b3be6c48753390e72565e5c5020b35e54da5",
    "testharness"
   ],
+  "css/cssom-view/elementsFromPoint-svg-text.html": [
+   "2558de194a2f824181bead014c78787ece2d230f",
+   "testharness"
+  ],
   "css/cssom-view/elementsFromPoint-svg.html": [
    "2aef08e76167d67ca80f2f993d249692c7cc8ff8",
    "testharness"
@@ -560941,7 +561052,7 @@
    "testharness"
   ],
   "encoding/big5-encoder.html": [
-   "c5fec0f733b77620267488917cf54554c766801f",
+   "b9635c43ce159e1961106b039dce0e3d04fade34",
    "testharness"
   ],
   "encoding/eof-shift_jis-ref.html": [
@@ -560981,7 +561092,7 @@
    "testharness"
   ],
   "encoding/gbk-encoder.html": [
-   "d099c6f374df5e68dd44bd6fe6115c415e74e91c",
+   "30bdfc96ffaff0277ceca69aad43d82d5ac691b6",
    "testharness"
   ],
   "encoding/idlharness.any.js": [
@@ -560993,7 +561104,7 @@
    "testharness"
   ],
   "encoding/iso-2022-jp-encoder.html": [
-   "3e1ef3ebcb1f0c15251dd968848b9e6805aa8b90",
+   "771631eca687f2d4abbf7cb9337af4ecded432e4",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/euc-jp/eucjp-decode-cseucpkdfmtjapanese.html": [
@@ -561025,7 +561136,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html": [
-   "8a1e3421b49173a03f55447b13e0fa8991e0114c",
+   "64fcbe6783d68372c9a03a1e732ad7acbfff925f",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html.headers": [
@@ -561033,7 +561144,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html": [
-   "2d0c46478ea701ab05824b0f334da16fb42c34b0",
+   "e7897095737650b30287cf4e618f5502d8bf86e2",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html.headers": [
@@ -561041,7 +561152,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html": [
-   "a838bc3715b451abf71ab6033da96ac3661a0fcb",
+   "f4245d39d4435d9c00b981d220677ff0e3579106",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html.headers": [
@@ -561065,7 +561176,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html": [
-   "7d40adac42aa7984b271d38d08f34bdc57956e81",
+   "3ff8533d6e7c59ea4a2fe98255e140b7b583ef2c",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html.headers": [
@@ -561073,7 +561184,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html": [
-   "7a6264e73b6f555b55307d4316b64b685bc4eed8",
+   "eeb61c360f85949479c970652c81532d27e38892",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html.headers": [
@@ -561081,7 +561192,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html": [
-   "94a2d523cca2484c1646ea38cc35463104bcdf6a",
+   "6c1e0582aae5a1dc83ea286feebebe69c6e218e8",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html.headers": [
@@ -561165,7 +561276,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html": [
-   "56eac9997ca4620ae3f60ac94f4746f16ad69398",
+   "d2cbf81979d2755352b9f007c40a6340b60e74d3",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html.headers": [
@@ -561173,7 +561284,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html": [
-   "04b9ba862024429668725770249a13a93118a1ce",
+   "b6b1deba45ea2621747d292443758adfb075e27e",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html.headers": [
@@ -561181,7 +561292,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html": [
-   "a10fb4f38065dce550f099b83dee5315b014d9bd",
+   "4cb2e185dedbd21c3632b7a31e883580e71b366f",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html.headers": [
@@ -561201,7 +561312,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html": [
-   "c250dd2597bf3e6b66d4bed1484363ee186197e3",
+   "cdc3fe8fc70539fc6415e2d3b43fda6f87d09262",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html.headers": [
@@ -561209,7 +561320,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html": [
-   "a54eafaa9c27429edf96650392d288805509f6a5",
+   "19c4224bda8f399f090f3ea4d77c10a0f47513e8",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html.headers": [
@@ -561217,7 +561328,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html": [
-   "f4f427e139bf5d92c4982d108315733ce10c091c",
+   "a99791f74775a996f49e4b60a369d5b81d289c0d",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html.headers": [
@@ -561317,7 +561428,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html": [
-   "84cd159f998e8e6ad80d0403d0128bd72718e674",
+   "034b3f10660076f877d7e78699cd5103d8c955f7",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html.headers": [
@@ -561325,7 +561436,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html": [
-   "125c9ecd59012aa5b4ad6c6dfaa7586d1f6b2593",
+   "abe031cce4bec1c40f37fcff428b874ef3ef1f76",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html.headers": [
@@ -561333,7 +561444,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html": [
-   "0099dd77b846ad2771aa278070b85ebf1b577a77",
+   "dcba1f4b6755e55ed5dbfa3d2cff642324aa6c2a",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html.headers": [
@@ -561397,7 +561508,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html": [
-   "a5ad64e3cfbd60d2f7df60c3708c66441a0511df",
+   "94990204891a673ed591a05bd4423b8d22a907ac",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html.headers": [
@@ -561405,7 +561516,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html": [
-   "c92ed9030f97d8e86fdafdb024fc7d32b0b87861",
+   "e3ef37abf1fb9d6a39f391c4e5a4b376cad808c8",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html.headers": [
@@ -561413,7 +561524,7 @@
    "support"
   ],
   "encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html": [
-   "cb8f12a62af6ea1be459ff8ca1c3e8846a8b9d55",
+   "a1cfb188c286c2f34d95fe2ca180dd577da1d7b5",
    "testharness"
   ],
   "encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html.headers": [
@@ -561569,7 +561680,7 @@
    "support"
   ],
   "encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html": [
-   "ac3af4e3ae4831d6bbb4a10cf20165c8c6f6f0c0",
+   "f9710ba55e4f6781f14f7b292c767cf87fc40090",
    "testharness"
   ],
   "encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html.headers": [
@@ -561581,7 +561692,7 @@
    "support"
   ],
   "encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html": [
-   "ac75e0cdb92edcec4ccbcea4e4d45329305fd4be",
+   "936dedf12d56abe3083061a68b6be806a8cb8503",
    "testharness"
   ],
   "encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html.headers": [
@@ -561653,7 +561764,7 @@
    "support"
   ],
   "encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html": [
-   "ad6ba78bc2ebc5b88b08ac19efe60f6220a1f636",
+   "e855d30690f5aed7043442f233cbb77fc209bca0",
    "testharness"
   ],
   "encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html.headers": [
@@ -561661,7 +561772,7 @@
    "support"
   ],
   "encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html": [
-   "dce0fad843d12c98905f1bb3edbe5343f7849b0c",
+   "f4caa1544f2291f394f58a4835f1fb5962baac14",
    "testharness"
   ],
   "encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html.headers": [
@@ -561837,7 +561948,7 @@
    "support"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html": [
-   "158e2df87e89f8d10ac045a8c6d7b1a879c60c05",
+   "7201211915cb8ae3ac0b7f5656c295f3c08b3089",
    "testharness"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html.headers": [
@@ -561845,7 +561956,7 @@
    "support"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html": [
-   "07fc6c15fc19b39e458670b19efc95d46822a889",
+   "3eb05f9627d84506e9d730b9e26021403963d0f9",
    "testharness"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html.headers": [
@@ -561853,7 +561964,7 @@
    "support"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html": [
-   "0c4726348095a7b2a2954e4516bfad4b6bf64e59",
+   "d4e49734b115c0bf3f0ab2ddc7a3de4556866e9c",
    "testharness"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html.headers": [
@@ -561861,7 +561972,7 @@
    "support"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html": [
-   "9835733d78de331c1ad9297572b321265a6a03c9",
+   "b24f67557b5e6ef966484b4c0b6b1c90a69b24ee",
    "testharness"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html.headers": [
@@ -561869,7 +561980,7 @@
    "support"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html": [
-   "65056fd448b1783a93866c6dfe4f0f84ecc65058",
+   "f4ce13cd0e392452ce160d0b688315ef039e2e56",
    "testharness"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html.headers": [
@@ -561877,7 +561988,7 @@
    "support"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-pua.html": [
-   "836a669b04de5ba3a3c3c429ea7d89b67d6f58b4",
+   "4e83b4a9d2695780b0ad87ac8519f36b83778ee6",
    "testharness"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-form-x-x-big5.html": [
@@ -561897,7 +562008,7 @@
    "support"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html": [
-   "b0f2f3bd2bad4eb4b2979bf8c11105f6c0a42dd8",
+   "90cbc57fb49501ff276c2198235f0d5c2d5561eb",
    "testharness"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html.headers": [
@@ -561905,7 +562016,7 @@
    "support"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html": [
-   "c6850b7f03fbfd76bfc156593d7e75887799baa4",
+   "2ec76262a6bc1a789999fd51b394a66a878bc6bf",
    "testharness"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html.headers": [
@@ -561913,7 +562024,7 @@
    "support"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html": [
-   "493dd0361da6e0ce711e05e90fd3a40125be5ba3",
+   "ba76ce0d3d04f97074c712ce6b11a7d6b523fb33",
    "testharness"
   ],
   "encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html.headers": [
@@ -563256,6 +563367,18 @@
    "4239ec4ef240e199f15a38145d478d2c0aa43ad2",
    "support"
   ],
+  "feature-policy/experimental-features/document-stream-insertion.tentative.html": [
+   "ec2c7269eff25b93d40b233ba0e17c69d31404e9",
+   "testharness"
+  ],
+  "feature-policy/experimental-features/resources/common.js": [
+   "36dd671a85ed93f2e69927c843243cb953f82a97",
+   "support"
+  ],
+  "feature-policy/experimental-features/resources/document-stream-insertion.html": [
+   "a0e39689056dc5cc24ad2d7e6fb2c681e84fd35d",
+   "support"
+  ],
   "feature-policy/experimental-features/resources/feature-policy-image.html": [
    "7ac7a5803b60a4f95b454aa44e0a79f363cffade",
    "support"
@@ -563281,7 +563404,7 @@
    "support"
   ],
   "feature-policy/experimental-features/resources/vertical-scroll.js": [
-   "cfa86de92596fa755d2c3a001b2c33f74283665a",
+   "a62c440428fe22a7afd4d8174e47dfc483c7de90",
    "support"
   ],
   "feature-policy/experimental-features/resources/video.ogv": [
@@ -563297,11 +563420,11 @@
    "support"
   ],
   "feature-policy/experimental-features/vertical-scroll-scrollintoview.tentative.html": [
-   "fe6000c242c73c81b5fc3c227f7703299fea455c",
+   "032bcf5ef253650570c3ded97090aab45da2661c",
    "testharness"
   ],
   "feature-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html": [
-   "bdaef76d16a826efebedade2127f006c5c3a49ea",
+   "32f1b7eacf4de1d7d792bb27ca439636c242c29c",
    "manual"
   ],
   "feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html": [
@@ -564085,7 +564208,7 @@
    "testharness"
   ],
   "fetch/api/request/resources/cache.py": [
-   "3cd7d5191fe33b2f2dab571a4b006d8332fdf42e",
+   "fa831de695ef775b03a2b89a6cb691636b26027f",
    "support"
   ],
   "fetch/api/request/resources/hello.txt": [
@@ -564101,11 +564224,11 @@
    "testharness"
   ],
   "fetch/api/resources/authentication.py": [
-   "b915aef6ecaacf3484e7a1144ed4769c4ff36539",
+   "3664b86c40d0b5965aa5f9625ff65ea4960b1c30",
    "support"
   ],
   "fetch/api/resources/bad-chunk-encoding.py": [
-   "a916571cccadbe7dcc59ae1fa60f968b28d1ef47",
+   "7011a780dfe97baf32e83925bbaf8b13abcc76b8",
    "support"
   ],
   "fetch/api/resources/basic.html": [
@@ -564145,7 +564268,7 @@
    "support"
   ],
   "fetch/api/resources/inspect-headers.py": [
-   "c062c905d538cfa96156fd38d98f586b2c4fb3b5",
+   "44e40ee48d2bfc3c49126b32027ee9db6176ec38",
    "support"
   ],
   "fetch/api/resources/keepalive-iframe.html": [
@@ -564157,7 +564280,7 @@
    "support"
   ],
   "fetch/api/resources/preflight.py": [
-   "de99c8990074a9f248989cebe7cf1adb0f4ec84b",
+   "cbc167808023cbb09cc0a362cc27250ecabf8df8",
    "support"
   ],
   "fetch/api/resources/redirect-empty-location.py": [
@@ -564165,7 +564288,7 @@
    "support"
   ],
   "fetch/api/resources/redirect.py": [
-   "37307bdb30853c2e824cce1fd9a190741e4975ce",
+   "0cc024ff5930697fdd7226608cb5990a614ccafd",
    "support"
   ],
   "fetch/api/resources/script-with-header.py": [
@@ -564193,7 +564316,7 @@
    "support"
   ],
   "fetch/api/resources/trickle.py": [
-   "87a83b390ae91e4419dc580d8426277be48c92d8",
+   "361d2743163bf55621bb0ff3feba4d99a0768beb",
    "support"
   ],
   "fetch/api/resources/utils.js": [
@@ -564537,7 +564660,7 @@
    "testharness"
   ],
   "fetch/http-cache/resources/http-cache.py": [
-   "f2e102b289c8ef55628800ae07b3737367ecbf65",
+   "00b65e27915c5d16f0de04821eacc675b32e4ee7",
    "support"
   ],
   "fetch/http-cache/resources/securedimage.py": [
@@ -564569,15 +564692,15 @@
    "testharness"
   ],
   "fetch/nosniff/resources/css.py": [
-   "4ae9ff638587fcc96472709e31466a469061a3b0",
+   "5f581aea8cfcc09fe6efbc6eaf0695804cca32bb",
    "support"
   ],
   "fetch/nosniff/resources/image.py": [
-   "82bd978c186e3b468d5e3a15623718484fec926e",
+   "2018bb1c6058b9c7a78ec9e59e51308d52ded541",
    "support"
   ],
   "fetch/nosniff/resources/js.py": [
-   "82dfe26fa136b2158040554a752e06bdeb503909",
+   "798cfa4cec411e5620279c77f948b0a3ed48624a",
    "support"
   ],
   "fetch/nosniff/resources/nosniff-first.asis": [
@@ -564605,7 +564728,7 @@
    "support"
   ],
   "fetch/nosniff/resources/worker.py": [
-   "e6b1f991560ed3b7f09b0e78722674e83a2de870",
+   "559f693c7411f8d575282cf77380a2179c06281b",
    "support"
   ],
   "fetch/nosniff/script.html": [
@@ -564620,6 +564743,46 @@
    "a9e0f5b9b70917aabbff3ad5dd03a5d5dccfa9f0",
    "testharness"
   ],
+  "fetch/sec-metadata/README.md": [
+   "75d58b35c1e5572d02dd3ad90ac65301e35c4bc7",
+   "support"
+  ],
+  "fetch/sec-metadata/fetch.tentative.https.sub.html": [
+   "6ce26d3683b78ca74a20b14ccca077cf375d742b",
+   "testharness"
+  ],
+  "fetch/sec-metadata/iframe.tentative.https.sub.html": [
+   "0308cd613a3099bf04469fba6273f46db991d49c",
+   "testharness"
+  ],
+  "fetch/sec-metadata/img.tentative.https.sub.html": [
+   "63a6c8a45102527079acb81d1c57d5dc49c07e4b",
+   "testharness"
+  ],
+  "fetch/sec-metadata/resources/echo-as-json.py": [
+   "bbe86e17580229158500722115a1347ca8fa2abb",
+   "support"
+  ],
+  "fetch/sec-metadata/resources/echo-as-script.py": [
+   "f3de57b64101ddcff326bbef8132a905d31356ce",
+   "support"
+  ],
+  "fetch/sec-metadata/resources/helper.js": [
+   "64d204e36b6ab3b7268d6fd8e0694081222b98ee",
+   "support"
+  ],
+  "fetch/sec-metadata/resources/post-to-owner.py": [
+   "2f57a1ddf411864ad2b1ba75f95453d9ed54e3f6",
+   "support"
+  ],
+  "fetch/sec-metadata/script.tentative.https.sub.html": [
+   "147291288dacf51942cadc8a85f7842c3bf19b34",
+   "testharness"
+  ],
+  "fetch/sec-metadata/window-open.tentative.https.sub.html": [
+   "116c597fb1909f7c4a67c8ada3bfeb6c011d7b04",
+   "testharness"
+  ],
   "fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html": [
    "1059b1c0907444bd416889f99d766a566ba9bde3",
    "testharness"
@@ -566584,6 +566747,14 @@
    "fb63063e0ff1ca6aaa350fae9b8f01bed5f9771f",
    "testharness"
   ],
+  "html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding-2.html": [
+   "62b3f908914b6b49c9b695f544a7e6489d3b9ec7",
+   "testharness"
+  ],
+  "html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding.html": [
+   "9ba63dfc8f2a9310830b6b5073d994a821369c01",
+   "testharness"
+  ],
   "html/browsers/browsing-the-web/scroll-to-fragid/navigate-helpers.js": [
    "5b318196cb31c35e1b39eccd9e6a131a882f1a90",
    "support"
@@ -566677,7 +566848,7 @@
    "support"
   ],
   "html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html": [
-   "8e48ede5ef227e88a091f1d33b385d0b3dff713c",
+   "49a3e27670f5902309f45be654ad9e12d7f9c500",
    "testharness"
   ],
   "html/browsers/browsing-the-web/unloading-documents/pagehide-on-history-forward-1.html": [
@@ -574997,7 +575168,7 @@
    "support"
   ],
   "html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html": [
-   "bc42ced67ad1368f3cf459dd113b131c69aaba78",
+   "34aa7e5a7d4daba412fa700859913cf9def77565",
    "testharness"
   ],
   "html/infrastructure/urls/resolving-urls/query-encoding/resources/blank.py": [
@@ -575017,7 +575188,7 @@
    "support"
   ],
   "html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js": [
-   "70fd863f8335a2026d5755cf2ba7a01d98222ec0",
+   "03fc73b64f0fd6f80bbb5616da4a4528162638ee",
    "support"
   ],
   "html/infrastructure/urls/resolving-urls/query-encoding/resources/resource.py": [
@@ -577904,8 +578075,12 @@
    "e955322b149ecb74471bc972a4662972fa287516",
    "testharness"
   ],
+  "html/semantics/embedded-content/media-elements/track/track-element/track-remove-track-inband.html": [
+   "652c94e9776d84e7bbec2b3b5758ed6408d41d1a",
+   "testharness"
+  ],
   "html/semantics/embedded-content/media-elements/track/track-element/track-remove-track.html": [
-   "931cfc4d06107dfccb001fbeaeef987cca528747",
+   "a59413e676dd9c05b13bb3f9405cc1a6d0bf933d",
    "testharness"
   ],
   "html/semantics/embedded-content/media-elements/track/track-element/track-selection-metadata.html": [
@@ -579905,7 +580080,7 @@
    "support"
   ],
   "html/semantics/forms/form-submission-0/form-data-set-usv.html": [
-   "6c089d542437cbd969ec76959344d9209c54f5ea",
+   "ae56e62c8b5ba0132d6270b478316fa8b6807b79",
    "testharness"
   ],
   "html/semantics/forms/form-submission-0/form-echo.py": [
@@ -585648,6 +585823,10 @@
    "f2c8fc84af7bf785ba42f1398181e2ab08c3826a",
    "support"
   ],
+  "interfaces/battery.idl": [
+   "37550560186be55b56d226be2fdecc1e36574a6d",
+   "support"
+  ],
   "interfaces/budget-api.idl": [
    "99f4eacad964a3ca3bcc034b48a2f4c4a2bd6f72",
    "support"
@@ -585721,7 +585900,7 @@
    "support"
   ],
   "interfaces/gamepad.idl": [
-   "89fa62f6e0d1fdb497ce6550804b57a5d4ee0d0f",
+   "f112b177a27816085e46d4949b404f2d5666881a",
    "support"
   ],
   "interfaces/geolocation-sensor.idl": [
@@ -585769,7 +585948,7 @@
    "support"
   ],
   "interfaces/payment-request.idl": [
-   "a7700006f4af50e069f6557bc7fc5affdd0c2d11",
+   "8bf519a543c72c282ac08f3feb2b5522913ec82f",
    "support"
   ],
   "interfaces/proximity.idl": [
@@ -585785,7 +585964,7 @@
    "support"
   ],
   "interfaces/selection-api.idl": [
-   "f9f483a150b0e918f653f6ce4e84eb9c044d921f",
+   "c8c9e45b541e511673dbe8ddd1321dceef2856b4",
    "support"
   ],
   "interfaces/sensors.idl": [
@@ -585808,6 +585987,10 @@
    "416ee65b3ba9e438a3178c6c04a414f42d759fc8",
    "support"
   ],
+  "interfaces/vibration.idl": [
+   "d1f3f51b0c6a46958d4bb3e9cc8bbc85e8a74512",
+   "support"
+  ],
   "interfaces/wake-lock.idl": [
    "7d0ee3d60a923bf454e18f9116cded1cc3a16f9b",
    "support"
@@ -607237,7 +607420,7 @@
    "testharness"
   ],
   "service-workers/service-worker/resource-timing.https.html": [
-   "23cadb03b48a885dbbd9a5dfdc38b5b58f99d18a",
+   "18979624d3fec57451f3eb41a67c2c0967f7da4f",
    "testharness"
   ],
   "service-workers/service-worker/resources/404.py": [
@@ -608089,11 +608272,11 @@
    "support"
   ],
   "service-workers/service-worker/resources/resource-timing-iframe.sub.html": [
-   "75bd224a9680af0557c53fb6e77645e4e0b8173d",
+   "d14ea4b8a8418f20b126e835eec4c82871cce81a",
    "support"
   ],
   "service-workers/service-worker/resources/resource-timing-worker.js": [
-   "04a965dc0324c035bb3331e546d9bb43230d5eac",
+   "021564cc105a8a2a0340e95fbf7bfc4bffe49c35",
    "support"
   ],
   "service-workers/service-worker/resources/respond-then-throw-worker.js": [
@@ -610309,7 +610492,7 @@
    "testharness"
   ],
   "streams/writable-streams/general.js": [
-   "af1848e49d119ba4e57b8354052e161ac8e80632",
+   "754d9bdf7b7ca32cc44a27c908831172741642b1",
    "support"
   ],
   "streams/writable-streams/general.serviceworker.https.html": [
@@ -610369,7 +610552,7 @@
    "testharness"
   ],
   "streams/writable-streams/start.js": [
-   "efd4b220ff356a542efdd57293993e5deff3a884",
+   "a756691be0e331bda99aa92b4e2de85d0d652805",
    "support"
   ],
   "streams/writable-streams/start.serviceworker.https.html": [
@@ -610608,12 +610791,12 @@
    "a5fbcba1ea5ba32d55210b0a87b6ecdeafbae5fe",
    "testharness"
   ],
-  "svg/extensibility/foreignObject/foreign-object-paints-before-rect-expected.html": [
+  "svg/extensibility/foreignObject/foreign-object-paints-before-rect-ref.html": [
    "18e188a6279e64cbabdd4bb638b06d4a5b22fca8",
    "support"
   ],
   "svg/extensibility/foreignObject/foreign-object-paints-before-rect.html": [
-   "f626d744f7bd101cf31d85e59747e8470fa91398",
+   "f6a09ab5b6577887ddddc4cf2ff9e97c9e56f6da",
    "reftest"
   ],
   "svg/extensibility/foreignObject/foreign-object-size-ref.html": [
@@ -613937,7 +614120,7 @@
    "support"
   ],
   "url/README.md": [
-   "67bbc49a62ee08a94b7b55fff97e1160bf88bc33",
+   "c617345fc667ed52a8e97027d121001d7a9edae0",
    "support"
   ],
   "url/a-element-origin-xhtml.xhtml": [
@@ -624293,7 +624476,7 @@
    "testharness"
   ],
   "xhr/open-url-encoding.htm": [
-   "a36c7b0e5919af7842883582ef9fc415d8f7ef25",
+   "ba2438440413dd999906c9055b3ccb0ab6988a74",
    "testharness"
   ],
   "xhr/open-url-fragment.htm": [
@@ -624401,11 +624584,11 @@
    "testharness"
   ],
   "xhr/resources/accept-language.py": [
-   "c8e945b53770efb8e4312f457a5a7261bc88a36c",
+   "263de837fad1aa3c7d28fecfbf72ad83fcef5d4c",
    "support"
   ],
   "xhr/resources/accept.py": [
-   "4769a0c31c00777fb37e1af76209e68040918b64",
+   "8e773469937bd2432b623312804b5b71e7eea791",
    "support"
   ],
   "xhr/resources/access-control-allow-lists.py": [
@@ -624413,7 +624596,7 @@
    "support"
   ],
   "xhr/resources/access-control-allow-with-body.py": [
-   "fbd35be708e601c7c3fb625ce28b9f43de784e13",
+   "fbe5a6402dc3688e3ba3fc2b33990a75cb84cf84",
    "support"
   ],
   "xhr/resources/access-control-auth-basic.py": [
@@ -624461,7 +624644,7 @@
    "support"
   ],
   "xhr/resources/access-control-basic-whitelist-response-headers.py": [
-   "c530b8431372e0511c91b150c5f1015d504ae374",
+   "40bd1d3bee7cad2223ab928f59bb7c61ceb9243c",
    "support"
   ],
   "xhr/resources/access-control-cookie.py": [
@@ -624469,11 +624652,11 @@
    "support"
   ],
   "xhr/resources/access-control-origin-header.py": [
-   "529883eed380c4505c1ddbc87ae5885254756626",
+   "c3f82deed293f8a3fc6d59e57cd64a2bfda02730",
    "support"
   ],
   "xhr/resources/access-control-preflight-denied.py": [
-   "b41ba9f1e3fcad508d575331e0f3f43bc75c07b9",
+   "149db0e7339f246e7687b51d5f409471ae72834f",
    "support"
   ],
   "xhr/resources/access-control-preflight-request-header-lowercase.py": [
@@ -624509,7 +624692,7 @@
    "support"
   ],
   "xhr/resources/auth2/corsenabled.py": [
-   "4136b00b543096216f9f1ad1314c7062dda04179",
+   "7dbf400f1c5765da2f9e377141c0526532b9a93f",
    "support"
   ],
   "xhr/resources/auth3/auth.py": [
@@ -624529,11 +624712,11 @@
    "support"
   ],
   "xhr/resources/auth7/corsenabled.py": [
-   "cbc1e4a39cc2e999ef7bd4053a600e8b0d515bb5",
+   "8f13d12d8815be1b96d822a7339e85c3f30c704b",
    "support"
   ],
   "xhr/resources/auth8/corsenabled-no-authorize.py": [
-   "523fbc134ecfee5b13e4ef93508712847fc4e396",
+   "d6f53de9fa7d2b864f829edb6be9d2a3720b7558",
    "support"
   ],
   "xhr/resources/auth9/auth.py": [
@@ -624541,7 +624724,7 @@
    "support"
   ],
   "xhr/resources/authentication.py": [
-   "0a592bcf4ebdefec865fc471f4fc34ffafea2244",
+   "fef65f09936bf22b36bd2e7fe1af9e25c4a3bd55",
    "support"
   ],
   "xhr/resources/base.xml": [
@@ -624549,15 +624732,15 @@
    "support"
   ],
   "xhr/resources/chunked.py": [
-   "be48633bdec117d50bce7a8e4323667881c8e367",
+   "e964d8d324763fafe1e16aec21f501e0b2c834cb",
    "support"
   ],
   "xhr/resources/conditional.py": [
-   "0796447779cee59308620c218160faaedbff608e",
+   "31a0df99d497e112ae0daf17ea9fd1affebb4373",
    "support"
   ],
   "xhr/resources/content.py": [
-   "4bcdf8d22cbb4119b4236f65e0177c3830f79739",
+   "ea26ee814462e34e325e38317a6c9be3ca387f04",
    "support"
   ],
   "xhr/resources/corsenabled.py": [
@@ -624565,7 +624748,7 @@
    "support"
   ],
   "xhr/resources/delay.py": [
-   "004949bbab102f3336d4a40e33f04eb57efdbb3d",
+   "cd571d302dd58c9910b4f9cc0fd5f69067d4123f",
    "support"
   ],
   "xhr/resources/echo-headers.py": [
@@ -624589,7 +624772,7 @@
    "support"
   ],
   "xhr/resources/gzip.py": [
-   "a259f50e91a706acf4d9d0be8a01bd046544ea55",
+   "3b0a547a9d8bf8a1435779aec406462441a930b8",
    "support"
   ],
   "xhr/resources/header-content-length.asis": [
@@ -624609,7 +624792,7 @@
    "support"
   ],
   "xhr/resources/headers.py": [
-   "9728a796eb49af8303249f0a806ffaada599fc66",
+   "ef9619b217319c4fbeb3e65c05626b098487050c",
    "support"
   ],
   "xhr/resources/image.gif": [
@@ -624625,7 +624808,7 @@
    "support"
   ],
   "xhr/resources/infinite-redirects.py": [
-   "bd033f0de21dc68ed1d4303fee49e64dd0916722",
+   "6fd1f534b620d378be642608b7bd5c073ce6f591",
    "support"
   ],
   "xhr/resources/init.htm": [
@@ -624633,7 +624816,7 @@
    "support"
   ],
   "xhr/resources/inspect-headers.py": [
-   "aab673bbdc7411c40ef2d7350486e779f3703e89",
+   "0b61c0b1744e0d6ad18508042091ccafe8f1fa00",
    "support"
   ],
   "xhr/resources/invalid-utf8-html.py": [
@@ -624665,11 +624848,11 @@
    "support"
   ],
   "xhr/resources/redirect.py": [
-   "988961f44badedfcea4e1660339ea921178b7a42",
+   "a6eb55393ae50f4c479d44c0db8daa82b444be7a",
    "support"
   ],
   "xhr/resources/requri.py": [
-   "7e84cbcb29783dd435c9be6ad960731d5d92706c",
+   "883f320cc67897a72b9a6b3de01b18dff746f055",
    "support"
   ],
   "xhr/resources/reset-token.py": [
@@ -624697,7 +624880,7 @@
    "support"
   ],
   "xhr/resources/shift-jis-html.py": [
-   "6348753f63dec61aeb6c17ea0a7994f64a846ae2",
+   "e464d67c8f9ecd61555302b53e92fcc267f35259",
    "support"
   ],
   "xhr/resources/status.py": [
@@ -624705,11 +624888,11 @@
    "support"
   ],
   "xhr/resources/trickle.py": [
-   "11df0d34ce5a0ef7193456125ce5546f75946f7a",
+   "432be4cbf4bc3acbcb3df92a27b31cf6de172bca",
    "support"
   ],
   "xhr/resources/upload.py": [
-   "e1addc2a9f014c2546b5770dd328b1562dc4fdc3",
+   "9458523526666d224f2e411dca685130c88f5542",
    "support"
   ],
   "xhr/resources/utf16-bom.json": [
diff --git a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
index 7ff7dbf5769..3951ec8f86f 100644
--- a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
@@ -284,3 +284,45 @@
   [Descriptor mathcing priority: Style has higher priority than weight]
     expected: FAIL
 
+  [Matching font-stretch: '100%' should prefer '110% 120%' over '115% 116%']
+    expected: FAIL
+
+  [Matching font-stretch: '110%' should prefer '110% 120%' over '115% 116%']
+    expected: FAIL
+
+  [Matching font-stretch: '110%' should prefer '115% 116%' over '105%']
+    expected: FAIL
+
+  [Matching font-stretch: '110%' should prefer '105%' over '100%']
+    expected: FAIL
+
+  [Matching font-stretch: '110%' should prefer '100%' over '50% 80%']
+    expected: FAIL
+
+  [Matching font-stretch: '110%' should prefer '50% 80%' over '60% 70%']
+    expected: FAIL
+
+  [Matching font-stretch: '90%' should prefer '90% 100%' over '50% 80%']
+    expected: FAIL
+
+  [Matching font-stretch: '90%' should prefer '50% 80%' over '60% 70%']
+    expected: FAIL
+
+  [Matching font-stretch: '90%' should prefer '60% 70%' over '110% 140%']
+    expected: FAIL
+
+  [Matching font-stretch: '90%' should prefer '110% 140%' over '120% 130%']
+    expected: FAIL
+
+  [Matching font-style: 'normal' should prefer 'normal' over 'oblique 0deg']
+    expected: FAIL
+
+  [Matching font-style: 'normal' should prefer 'oblique 0deg' over 'oblique 10deg 40deg']
+    expected: FAIL
+
+  [Matching font-style: 'normal' should prefer 'oblique 10deg 40deg' over 'oblique 20deg 30deg']
+    expected: FAIL
+
+  [Matching font-style: 'normal' should prefer 'oblique 20deg 30deg' over 'oblique -50deg -20deg']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini b/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini
index 33589c5901a..7c80799aece 100644
--- a/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini
@@ -29,6 +29,12 @@
   [Test @font-face matching for weight 1000]
     expected: FAIL
 
-  [Test @font-face matching for weight 420]
+  [Test @font-face matching for weight 99]
+    expected: FAIL
+
+  [Test @font-face matching for weight 100]
+    expected: FAIL
+
+  [Test @font-face matching for weight 249]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-values/vh_not_refreshing_on_chrome.html.ini b/tests/wpt/metadata/css/css-values/vh_not_refreshing_on_chrome.html.ini
deleted file mode 100644
index 26435e28b09..00000000000
--- a/tests/wpt/metadata/css/css-values/vh_not_refreshing_on_chrome.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[vh_not_refreshing_on_chrome.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-svg-text.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-svg-text.html.ini
new file mode 100644
index 00000000000..3f19d3a55ab
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-svg-text.html.ini
@@ -0,0 +1,13 @@
+[elementsFromPoint-svg-text.html]
+  [elementsFromPoint for a point inside a <text>]
+    expected: FAIL
+
+  [elementsFromPoint for a point inside a <tspan> nested in a <text> without content]
+    expected: FAIL
+
+  [elementsFromPoint for a point inside a <textPath> nested in a <text> without content]
+    expected: FAIL
+
+  [elementsFromPoint for a point inside an overlapping <tspan> nested in a <text>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/encoding/iso-2022-jp-encoder.html.ini b/tests/wpt/metadata/encoding/iso-2022-jp-encoder.html.ini
index 9b26f88c285..1479d7d1a1c 100644
--- a/tests/wpt/metadata/encoding/iso-2022-jp-encoder.html.ini
+++ b/tests/wpt/metadata/encoding/iso-2022-jp-encoder.html.ini
@@ -4,3 +4,6 @@
   [iso-2022-jp encoder: basics]
     expected: FAIL
 
+  [iso-2022-jp encoder: U+FFFD]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/sec-metadata/fetch.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/sec-metadata/fetch.tentative.https.sub.html.ini
new file mode 100644
index 00000000000..3a72c7d6b84
--- /dev/null
+++ b/tests/wpt/metadata/fetch/sec-metadata/fetch.tentative.https.sub.html.ini
@@ -0,0 +1,10 @@
+[fetch.tentative.https.sub.html]
+  [Same-origin fetch]
+    expected: FAIL
+
+  [Same-site fetch]
+    expected: FAIL
+
+  [Cross-site fetch]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/sec-metadata/iframe.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/sec-metadata/iframe.tentative.https.sub.html.ini
new file mode 100644
index 00000000000..e54c3f843dc
--- /dev/null
+++ b/tests/wpt/metadata/fetch/sec-metadata/iframe.tentative.https.sub.html.ini
@@ -0,0 +1,11 @@
+[iframe.tentative.https.sub.html]
+  expected: TIMEOUT
+  [Same-origin iframe]
+    expected: TIMEOUT
+
+  [Same-site iframe]
+    expected: TIMEOUT
+
+  [Cross-site iframe]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/fetch/sec-metadata/img.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/sec-metadata/img.tentative.https.sub.html.ini
new file mode 100644
index 00000000000..1873aa293ee
--- /dev/null
+++ b/tests/wpt/metadata/fetch/sec-metadata/img.tentative.https.sub.html.ini
@@ -0,0 +1,10 @@
+[img.tentative.https.sub.html]
+  [Same-origin image]
+    expected: FAIL
+
+  [Same-site image]
+    expected: FAIL
+
+  [Cross-site image]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/sec-metadata/script.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/sec-metadata/script.tentative.https.sub.html.ini
new file mode 100644
index 00000000000..ecf13666b3d
--- /dev/null
+++ b/tests/wpt/metadata/fetch/sec-metadata/script.tentative.https.sub.html.ini
@@ -0,0 +1,10 @@
+[script.tentative.https.sub.html]
+  [Same-origin script]
+    expected: FAIL
+
+  [Same-site script]
+    expected: FAIL
+
+  [Cross-site script]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding-2.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding-2.html.ini
new file mode 100644
index 00000000000..f97411c4dd0
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding-2.html.ini
@@ -0,0 +1,7 @@
+[fragment-and-encoding-2.html]
+  [Invalid percent-encoded UTF-8 byte should decode as U+FFFD]
+    expected: FAIL
+
+  [Percent-encoded UTF-8 BOM followed by invalid UTF-8 byte should decode as U+FEFF U+FFFD]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html.ini
deleted file mode 100644
index c05ae4896da..00000000000
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[navigation-within-beforeunload.html]
-  [Triggering navigation from within beforeunload event]
-    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..559c27de134 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,63 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
+  [HTML (quirks) IMG usemap="no-hash-name"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="no-hash-id"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="hash-last#"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap=""]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#percent-escape-name-%41"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#percent-escape-id-%41"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#no-such-map"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#different-CASE-name"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#different-CASE-id"]
+    expected: FAIL
+
+  [XHTML img usemap="no-hash-name"]
+    expected: FAIL
+
+  [XHTML img usemap="no-hash-id"]
+    expected: FAIL
+
+  [XHTML img usemap="hash-last#"]
+    expected: FAIL
+
+  [XHTML img usemap=""]
+    expected: FAIL
+
+  [XHTML img usemap="#"]
+    expected: FAIL
+
+  [XHTML img usemap="#percent-escape-name-%41"]
+    expected: FAIL
+
+  [XHTML img usemap="#percent-escape-id-%41"]
+    expected: FAIL
+
+  [XHTML img usemap="#no-such-map"]
+    expected: FAIL
+
+  [XHTML img usemap="#different-CASE-name"]
+    expected: FAIL
+
+  [XHTML img usemap="#different-CASE-id"]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/mozilla/img_find_non_sibling_map.html.ini b/tests/wpt/mozilla/meta/mozilla/img_find_non_sibling_map.html.ini
deleted file mode 100644
index c6be0f3c561..00000000000
--- a/tests/wpt/mozilla/meta/mozilla/img_find_non_sibling_map.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[img_find_non_sibling_map.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-non-reserved-words.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html.ini
similarity index 59%
rename from tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-non-reserved-words.html.ini
rename to tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html.ini
index fb8852c9e7a..fbdc89a8f0d 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-non-reserved-words.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html.ini
@@ -1,4 +1,4 @@
-[shader-with-non-reserved-words.html]
+[context-creation-and-destruction.html]
   expected: TIMEOUT
   [Overall test]
     expected: NOTRUN
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-release-with-workers.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation.html.ini
similarity index 62%
rename from tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-release-with-workers.html.ini
rename to tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation.html.ini
index 7aab2f5f662..393e42df192 100644
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-release-with-workers.html.ini
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation.html.ini
@@ -1,4 +1,4 @@
-[context-release-with-workers.html]
+[context-creation.html]
   expected: TIMEOUT
   [Overall test]
     expected: NOTRUN
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini
new file mode 100644
index 00000000000..b2918fac56f
--- /dev/null
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini
@@ -0,0 +1,2 @@
+[context-eviction-with-garbage-collection.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/web-platform-tests/battery-status/battery-interface-idlharness.https.html b/tests/wpt/web-platform-tests/battery-status/battery-interface-idlharness.https.html
index 3c587198f97..1a6ad544129 100644
--- a/tests/wpt/web-platform-tests/battery-status/battery-interface-idlharness.https.html
+++ b/tests/wpt/web-platform-tests/battery-status/battery-interface-idlharness.https.html
@@ -7,71 +7,26 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/WebIDLParser.js"></script>
 <script src="/resources/idlharness.js"></script>
-<script type="text/plain" class="untested">
-interface Navigator { };
-
-interface EventTarget {
-  void addEventListener(DOMString type, EventListener? callback, optional boolean capture);
-  void removeEventListener(DOMString type, EventListener? callback, optional boolean capture);
-  boolean dispatchEvent(Event event);
-};
-
-[Callback]
-interface EventListener {
-  void handleEvent(Event event);
-};
-[TreatNonObjectAsNull]
-callback EventHandlerNonNull = any (Event event);
-typedef EventHandlerNonNull? EventHandler;
-</script>
-<script type="text/plain">
-partial interface Navigator {
-    Promise<BatteryManager> getBattery ();
-};
-
-[Exposed=Window]
-interface BatteryManager : EventTarget {
-    readonly attribute boolean             charging;
-    readonly attribute unrestricted double chargingTime;
-    readonly attribute unrestricted double dischargingTime;
-    readonly attribute double              level;
-             attribute EventHandler        onchargingchange;
-             attribute EventHandler        onchargingtimechange;
-             attribute EventHandler        ondischargingtimechange;
-             attribute EventHandler        onlevelchange;
-};
-</script>
 <script>
 "use strict";
-var t = async_test();
-var idl_array = new IdlArray();
-var idls;
-var manager;
-[].forEach.call(document.querySelectorAll('script[type=text\\/plain]'), function(node) {
-  idls = node.textContent;
-  idl_array[(node.className === 'untested') ? 'add_untested_idls' : 'add_idls'](idls);
-});
-t.step(function() {
-  assert_idl_attribute(navigator, 'getBattery', 'navigator must have getBattery attribute');
-  navigator.getBattery().then(function(bm) {
-    manager = bm;
-    idl_array.add_objects({Navigator: ['navigator'], BatteryManager: ['manager']});
-    idl_array.test();
-    t.done();
-  }).catch(function(err) {
-    t.assert_unreached("navigator.getBattery failed");
+
+promise_test(async () => {
+  const idl_array = new IdlArray();
+  const dom_idl = await fetch("/interfaces/dom.idl").then(r => r.text());
+  const battery_idl = await fetch("/interfaces/battery.idl").then(r => r.text());
+  const manager = await navigator.getBattery();
+
+  idl_array.add_untested_idls(dom_idl, {only: ['EventTarget']});
+  idl_array.add_untested_idls('interface EventHandler {};');
+  idl_array.add_untested_idls('interface Navigator {};');
+  idl_array.add_idls(battery_idl);
+
+  window.manager = manager;
+
+  idl_array.add_objects({
+    Navigator: ['navigator'],
+    BatteryManager: ['manager'],
   });
-});
+  idl_array.test();
+}, "Test IDL implementation of Battery Status API");
 </script>
-
-<h2>Description</h2>
-<p>
-  This test validates the BatteryManager interface IDL.
-</p>
-<p>
-  This test uses <a href="/resources/idlharness.js">idlharness.js</a>, and
-  is complementary to the <a href="battery-interface.html">battery-interface.html</a>
-  test.
-</p>
-
-<div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/cors/resources/cors-cookie.py b/tests/wpt/web-platform-tests/cors/resources/cors-cookie.py
index 76fa6c165ba..061563e4f20 100644
--- a/tests/wpt/web-platform-tests/cors/resources/cors-cookie.py
+++ b/tests/wpt/web-platform-tests/cors/resources/cors-cookie.py
@@ -15,7 +15,7 @@ def main(request, response):
         body = request.cookies[ident].value
         response.delete_cookie(ident)
     else:
-        response.set_cookie(ident, "COOKIE");
+        response.set_cookie(ident, "COOKIE")
         body = "NO_COOKIE"
 
     return headers, body
diff --git a/tests/wpt/web-platform-tests/cors/resources/status.py b/tests/wpt/web-platform-tests/cors/resources/status.py
index d22378321e9..96950dae4fd 100644
--- a/tests/wpt/web-platform-tests/cors/resources/status.py
+++ b/tests/wpt/web-platform-tests/cors/resources/status.py
@@ -1,5 +1,5 @@
 def main(request, response):
-    response.headers.set("Access-Control-Allow-Origin", request.headers.get("origin") )
+    response.headers.set("Access-Control-Allow-Origin", request.headers.get("origin"))
     response.headers.set("Access-Control-Expose-Headers", "X-Request-Method")
 
     if request.method == 'OPTIONS':
@@ -10,7 +10,7 @@ def main(request, response):
 
     response.headers.set("X-Request-Method", request.method)
 
-    response.headers.set("X-A-C-Request-Method", request.headers.get("Access-Control-Request-Method", ""));
+    response.headers.set("X-A-C-Request-Method", request.headers.get("Access-Control-Request-Method", ""))
 
 
     #This should reasonably work for most response codes.
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-009.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-009.html
index 98c230fb5bf..dfc595f8204 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-009.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-009.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Grid Layout Test: Support for percentage values for gap with no defined height for the grid</title>
+<title>CSS Grid Layout Test: Support for percentage values for gap with indefinite percentage basis</title>
 <link rel="help" href="https://www.w3.org/TR/css-grid-1/#gutters">
 <link rel="help" href="https://www.w3.org/TR/css-align-3/#gap-shorthand">
-<link rel="match" href="../reference/grid-collapsed-row-gutters-ref.html">
+<link rel="match" href="../reference/grid-percentage-gap-ref.html">
 <link rel="author" title="Rachel Andrew" href="mailto:me@rachelandrew.co.uk">
 <style>
     #grid {
@@ -13,6 +13,7 @@
         grid-template-columns: 90px 90px;
         grid-template-rows: 90px 90px;
         background-color: green;
+        margin-bottom: 30px;
     }
 
     #grid > div {
@@ -20,10 +21,16 @@
     }
 </style>
 
-<p>The test passes if it has the same visual effect as reference. Column gap should be percentage of width. Row gap should resolve to auto, and therefore collapse to 0 height.</p>
+<p>The test passes if it has the same visual effect as reference. Column gap should be percentage of width. Row gap should be percentage of height.</p>
 <div id="grid">
     <div></div>
     <div></div>
     <div></div>
     <div></div>
-</div>
\ No newline at end of file
+</div>
+<div id="grid" style="display:inline-grid; width:auto; gap:calc(20px + 5%)">
+    <div></div>
+    <div></div>
+    <div></div>
+    <div></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-010.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-010.html
index 6b96fc25a9e..22be6df72e8 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-010.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-gutters-010.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
-<title>CSS Grid Layout Test: Support for percentage values for grid-gap with no defined height for the grid as alias for gap</title>
+<title>CSS Grid Layout Test: Support for percentage values for grid-gap with indefinite percentage basis</title>
 <link rel="help" href="https://www.w3.org/TR/css-grid-1/#gutters">
 <link rel="help" href="https://www.w3.org/TR/css-align-3/#gap-shorthand">
-<link rel="match" href="../reference/grid-collapsed-row-gutters-ref.html">
+<link rel="match" href="../reference/grid-percentage-gap-ref.html">
 <link rel="author" title="Rachel Andrew" href="mailto:me@rachelandrew.co.uk">
 <style>
     #grid {
@@ -13,6 +13,7 @@
         grid-template-columns: 90px 90px;
         grid-template-rows: 90px 90px;
         background-color: green;
+        margin-bottom: 30px;
     }
 
     #grid > div {
@@ -20,10 +21,16 @@
     }
 </style>
 
-<p>The test passes if it has the same visual effect as reference. Column gap should be percentage of width. Row gap should resolve to auto, and therefore collapse to 0 height.</p>
+<p>The test passes if it has the same visual effect as reference. Column gap should be percentage of width. Row gap should be percentage of height.</p>
 <div id="grid">
     <div></div>
     <div></div>
     <div></div>
     <div></div>
-</div>
\ No newline at end of file
+</div>
+<div id="grid" style="display:inline-grid; width:auto; grid-gap:calc(20px + 5%)">
+    <div></div>
+    <div></div>
+    <div></div>
+    <div></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-collapsed-row-gutters-ref.html b/tests/wpt/web-platform-tests/css/css-grid/reference/grid-collapsed-row-gutters-ref.html
deleted file mode 100644
index a0ff682c6a5..00000000000
--- a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-collapsed-row-gutters-ref.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8">
-<title>CSS Grid Layout Reference: a square with a green bar</title>
-<link rel="author" title="Rachel Andrew" href="mailto:me@rachelandrew.co.uk" />
-<style>
-    #grid {
-        width:200px;
-        height: 180px;
-        background-color: green;
-        position: relative;
-    }
-
-    #grid > div {
-        background-color: silver;
-        width: 90px;
-        height: 90px;
-        position: absolute;
-    }
-
-    #grid :nth-child(1) {
-        top: 0;
-        left: 0;
-    }
-
-    #grid :nth-child(2) {
-        top: 0;
-        left: 110px;
-    }
-
-    #grid :nth-child(3) {
-        top: 90px;
-        left: 0;
-    }
-
-    #grid :nth-child(4) {
-        top: 90px;
-        left: 110px;
-    }
-</style>
-
-<p>The test passes if it has the same visual effect as reference. Column gap should be percentage of width. Row gap should resolve to auto, and therefore collapse to 0 height.</p>
-<div id="grid">
-    <div></div>
-    <div></div>
-    <div></div>
-    <div></div>
-</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/reference/grid-percentage-gap-ref.html b/tests/wpt/web-platform-tests/css/css-grid/reference/grid-percentage-gap-ref.html
new file mode 100644
index 00000000000..f3616f7d07e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/reference/grid-percentage-gap-ref.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Reference: percentage grid gaps</title>
+<link rel="author" title="Rachel Andrew" href="mailto:me@rachelandrew.co.uk" />
+<style>
+    .grid {
+        width:200px;
+        height: 180px;
+        background-color: green;
+        position: relative;
+        margin-bottom: 30px;
+    }
+
+    .grid > div {
+        background-color: silver;
+        width: 90px;
+        height: 90px;
+        position: absolute;
+    }
+</style>
+
+<p>The test passes if it has the same visual effect as reference. Column gap should be percentage of width. Row gap should be percentage of height.</p>
+<div class="grid">
+    <div style="top:0;     left:0"></div>
+    <div style="top:0;     left:110px"></div>
+    <div style="top:108px; left:0"></div>
+    <div style="top:108px; left:110px"></div>
+</div>
+<div class="grid" style="height:200px">
+    <div style="top:0;     left:0"></div>
+    <div style="top:0;     left:120px"></div>
+    <div style="top:120px; left:0"></div>
+    <div style="top:120px; left:120px"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-svg-text.html b/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-svg-text.html
new file mode 100644
index 00000000000..9729724e67a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom-view/elementsFromPoint-svg-text.html
@@ -0,0 +1,51 @@
+<!DOCTYPE HTML>
+<title>Document.prototype.elementsFromPoint on SVG text content elements</title>
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-document-elementsfrompoint">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/elementsFromPoint.js"></script>
+<style>
+html, body {
+    margin: 0;
+    padding: 0;
+}
+#svg {
+    margin: 100px;
+    background-color: rgba(0,180,0,0.2);
+}
+text {
+    font-size: 50px;
+}
+</style>
+<div id='sandbox'>
+  <svg id='svg' width='300' height='300'>
+    <defs>
+      <path id="path" d="M10,170h1000"/>
+    </defs>
+    <text id="text1" x="10" y="50">Some text</text>
+    <text id="text2" x="10" y="110"><tspan id="tspan1">Some text</tspan></text>
+    <text id="text3"><textPath id="textpath1" xlink:href="#path">Some text</textPath></text>
+    <text id="text4" x="10" y="230">Text under<tspan id="tspan2" x="10">Text over</tspan></text>
+  </svg>
+</div>
+<script>
+test(function() {
+    assertElementsFromPoint('document', 125, 125,
+        [text1, svg, sandbox, document.body, document.documentElement]);
+}, 'elementsFromPoint for a point inside a <text>');
+
+test(function() {
+    assertElementsFromPoint('document', 125, 185,
+        [tspan1, svg, sandbox, document.body, document.documentElement]);
+}, 'elementsFromPoint for a point inside a <tspan> nested in a <text> without content');
+
+test(function() {
+    assertElementsFromPoint('document', 125, 245,
+        [textpath1, svg, sandbox, document.body, document.documentElement]);
+}, 'elementsFromPoint for a point inside a <textPath> nested in a <text> without content');
+
+test(function() {
+    assertElementsFromPoint('document', 125, 305,
+        [tspan2, text4, svg, sandbox, document.body, document.documentElement]);
+}, 'elementsFromPoint for a point inside an overlapping <tspan> nested in a <text>');
+</script>
diff --git a/tests/wpt/web-platform-tests/encoding/big5-encoder.html b/tests/wpt/web-platform-tests/encoding/big5-encoder.html
index 58d60d50db1..7260b6b155b 100644
--- a/tests/wpt/web-platform-tests/encoding/big5-encoder.html
+++ b/tests/wpt/web-platform-tests/encoding/big5-encoder.html
@@ -15,8 +15,8 @@
 
  encode("ab", "ab", "very basic")
  // edge cases
- encode("\u9EA6", "&%2340614;", "Highest-pointer BMP character excluded from encoder");
- encode("\uD858\uDE6B", "&%23156267;", "Highest-pointer character excluded from encoder");
+ encode("\u9EA6", "%26%2340614%3B", "Highest-pointer BMP character excluded from encoder");
+ encode("\uD858\uDE6B", "%26%23156267%3B", "Highest-pointer character excluded from encoder");
  encode("\u3000", "%A1@", "Lowest-pointer character included in encoder");
  encode("\u20AC", "%A3%E1", "Euro; the highest-pointer character before a range of 30 unmapped pointers");
  encode("\u4E00", "%A4@", "The lowest-pointer character after the range of 30 unmapped pointers");
@@ -24,8 +24,8 @@
  encode("\uFFE2", "%C8%CD", "The lowest-pointer character after the range of 41 unmapped pointers");
  encode("\u79D4", "%FE%FE", "The last character in the index");
  // not in index
- encode("\u2603", "&%239731;", "The canonical BMP test character that is not in the index");
- encode("\uD83D\uDCA9", "&%23128169;", "The canonical astral test character that is not in the index");
+ encode("\u2603", "%26%239731%3B", "The canonical BMP test character that is not in the index");
+ encode("\uD83D\uDCA9", "%26%23128169%3B", "The canonical astral test character that is not in the index");
  // duplicate low bits
  encode("\uD840\uDFB5", "%FDj", "A Plane 2 character whose low 16 bits match a BMP character that has a lower pointer");
  // prefer last
diff --git a/tests/wpt/web-platform-tests/encoding/gbk-encoder.html b/tests/wpt/web-platform-tests/encoding/gbk-encoder.html
index 90d0824ce23..a6074f975d3 100644
--- a/tests/wpt/web-platform-tests/encoding/gbk-encoder.html
+++ b/tests/wpt/web-platform-tests/encoding/gbk-encoder.html
@@ -17,5 +17,5 @@
  encode("\u4E02", "%81@", "character")
  encode("\uE4C6", "%A1@", "PUA")
  encode("\uE4C5", "%FE%FE", "PUA #2")
- encode("\ud83d\udca9", "&%23128169;", "poo")
+ encode("\ud83d\udca9", "%26%23128169%3B", "poo")
 </script>
diff --git a/tests/wpt/web-platform-tests/encoding/iso-2022-jp-encoder.html b/tests/wpt/web-platform-tests/encoding/iso-2022-jp-encoder.html
index d3124e5f54b..81bd18039b2 100644
--- a/tests/wpt/web-platform-tests/encoding/iso-2022-jp-encoder.html
+++ b/tests/wpt/web-platform-tests/encoding/iso-2022-jp-encoder.html
@@ -15,4 +15,5 @@
  encode("s", "s", "very basic")
  encode("\u00A5\u203Es\\\uFF90\u4F69", "%1B(J\\~s%1B(B\\%1B$B%_PP%1B(B", "basics")
  encode("\x0E\x0F\x1Bx", "%0E%0F%1Bx", "SO/SI ESC")
+ encode("\uFFFD", "%26%2365533%3B", "U+FFFD");
 </script>
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html
index 68129986fd0..f79178aefc4 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-han.html
@@ -170,10 +170,7 @@ function runNext(id) {
         for (var j = 0; j < cplist[i].length; j++) {
             var t = tests[i][j];
             t.step(function() {
-                assert_equals(
-                    normalizeStr(results[j]),
-                    normalizeStr(cplist[i][j].expected)
-                );
+                assert_equals(results[j], cplist[i][j].expected);
             });
             t.done();
         }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html
index 945c5c690dc..0f9ecff2dad 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-hangul.html
@@ -135,10 +135,7 @@ function runNext(id) {
         for (var j = 0; j < cplist[i].length; j++) {
             var t = tests[i][j];
             t.step(function() {
-                assert_equals(
-                    normalizeStr(results[j]),
-                    normalizeStr(cplist[i][j].expected)
-                );
+                assert_equals(results[j], cplist[i][j].expected);
             });
             t.done();
         }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html
index 0050e35f283..54da3eb89bc 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-form-errors-misc.html
@@ -179,10 +179,7 @@ function runNext(id) {
         for (var j = 0; j < cplist[i].length; j++) {
             var t = tests[i][j];
             t.step(function() {
-                assert_equals(
-                    normalizeStr(results[j]),
-                    normalizeStr(cplist[i][j].expected)
-                );
+                assert_equals(results[j], cplist[i][j].expected);
             });
             t.done();
         }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html
index 1f98ce3d596..c0519e8be10 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-han.html
@@ -21,7 +21,7 @@ function encode(input, expected, desc) {
         var a = document.createElement("a"); // <a> uses document encoding for URL's query
         a.href = "https://example.com/?" + input;
         result = a.search.substr(1); // remove leading "?"
-        assert_equals(normalizeStr(result), normalizeStr(expected));
+        assert_equals(result, expected);
     }, desc);
 }
 
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html
index fc12def3b32..29c9f223e90 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-hangul.html
@@ -21,7 +21,7 @@ function encode(input, expected, desc) {
         var a = document.createElement("a"); // <a> uses document encoding for URL's query
         a.href = "https://example.com/?" + input;
         result = a.search.substr(1); // remove leading "?"
-        assert_equals(normalizeStr(result), normalizeStr(expected));
+        assert_equals(result, expected);
     }, desc);
 }
 
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html
index 0b0f31b2af4..1456b945ae5 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/euc-jp/eucjp-encode-href-errors-misc.html
@@ -21,7 +21,7 @@ function encode(input, expected, desc) {
         var a = document.createElement("a"); // <a> uses document encoding for URL's query
         a.href = "https://example.com/?" + input;
         result = a.search.substr(1); // remove leading "?"
-        assert_equals(normalizeStr(result), normalizeStr(expected));
+        assert_equals(result, expected);
     }, desc);
 }
 
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html
index efb493bace4..13d4b968b15 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-han.html
@@ -170,10 +170,7 @@ function runNext(id) {
         for (var j = 0; j < cplist[i].length; j++) {
             var t = tests[i][j];
             t.step(function() {
-                assert_equals(
-                    normalizeStr(results[j]),
-                    normalizeStr(cplist[i][j].expected)
-                );
+                assert_equals(results[j], cplist[i][j].expected);
             });
             t.done();
         }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html
index ab61d60382b..1f1cce21f00 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-hangul.html
@@ -135,10 +135,7 @@ function runNext(id) {
         for (var j = 0; j < cplist[i].length; j++) {
             var t = tests[i][j];
             t.step(function() {
-                assert_equals(
-                    normalizeStr(results[j]),
-                    normalizeStr(cplist[i][j].expected)
-                );
+                assert_equals(results[j], cplist[i][j].expected);
             });
             t.done();
         }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html
index 6ffb6209670..54acbe487b6 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-form-errors-misc.html
@@ -179,10 +179,7 @@ function runNext(id) {
         for (var j = 0; j < cplist[i].length; j++) {
             var t = tests[i][j];
             t.step(function() {
-                assert_equals(
-                    normalizeStr(results[j]),
-                    normalizeStr(cplist[i][j].expected)
-                );
+                assert_equals(results[j], cplist[i][j].expected);
             });
             t.done();
         }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html
index a13556357d3..f12da7077f7 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-han.html
@@ -21,7 +21,7 @@ function encode(input, expected, desc) {
         var a = document.createElement("a"); // <a> uses document encoding for URL's query
         a.href = "https://example.com/?" + input;
         result = a.search.substr(1); // remove leading "?"
-        assert_equals(normalizeStr(result), normalizeStr(expected));
+        assert_equals(result, expected);
     }, desc);
 }
 
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html
index 78090e77690..04dc69df036 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-hangul.html
@@ -21,7 +21,7 @@ function encode(input, expected, desc) {
         var a = document.createElement("a"); // <a> uses document encoding for URL's query
         a.href = "https://example.com/?" + input;
         result = a.search.substr(1); // remove leading "?"
-        assert_equals(normalizeStr(result), normalizeStr(expected));
+        assert_equals(result, expected);
     }, desc);
 }
 
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html
index 2c0a2be556a..5fee8bb7c10 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/iso-2022-jp/iso2022jp-encode-href-errors-misc.html
@@ -21,7 +21,7 @@ function encode(input, expected, desc) {
         var a = document.createElement("a"); // <a> uses document encoding for URL's query
         a.href = "https://example.com/?" + input;
         result = a.search.substr(1); // remove leading "?"
-        assert_equals(normalizeStr(result), normalizeStr(expected));
+        assert_equals(result, expected);
     }, desc);
 }
 
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html
index 4193e2e15a2..8f802439e94 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-han.html
@@ -165,10 +165,7 @@ function runNext(id) {
     for (var j = 0; j < cplist[i].length; j++) {
       var t = tests[i][j];
       t.step(function() {
-        assert_equals(
-          normalizeStr(results[j]),
-          normalizeStr(cplist[i][j].expected)
-        );
+        assert_equals(results[j], cplist[i][j].expected);
       });
       t.done();
     }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html
index ae2db160c96..b2a953e1b98 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-hangul.html
@@ -135,10 +135,7 @@ function runNext(id) {
         for (var j = 0; j < cplist[i].length; j++) {
             var t = tests[i][j];
             t.step(function() {
-                assert_equals(
-                    normalizeStr(results[j]),
-                    normalizeStr(cplist[i][j].expected)
-                );
+                assert_equals(results[j], cplist[i][j].expected);
             });
             t.done();
         }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html
index ca0cfa3ccae..0dc90d16cdf 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-form-errors-misc.html
@@ -175,10 +175,7 @@ function runNext(id) {
     for (var j = 0; j < cplist[i].length; j++) {
       var t = tests[i][j];
       t.step(function() {
-        assert_equals(
-          normalizeStr(results[j]),
-          normalizeStr(cplist[i][j].expected)
-        );
+        assert_equals(results[j], cplist[i][j].expected);
       });
       t.done();
     }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html
index b396a7d5eb6..1f70550a2a2 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-han.html
@@ -21,7 +21,7 @@ function encode(input, expected, desc) {
 		var a = document.createElement("a"); // <a> uses document encoding for URL's query
 		a.href = "https://example.com/?" + input;
 		result = a.search.substr(1); // remove leading "?"
-		assert_equals(normalizeStr(result), normalizeStr(expected));
+		assert_equals(result, expected);
 	}, desc);
 }
 
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html
index 42dd93f06d3..29ec1a51820 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-hangul.html
@@ -21,7 +21,7 @@ function encode(input, expected, desc) {
     var a = document.createElement("a"); // <a> uses document encoding for URL's query
     a.href = "https://example.com/?" + input;
     result = a.search.substr(1); // remove leading "?"
-    assert_equals(normalizeStr(result), normalizeStr(expected));
+    assert_equals(result, expected);
   }, desc);
 }
 
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html
index 113dbd782b0..8341d834a7a 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-japanese/shift_jis/sjis-encode-href-errors-misc.html
@@ -21,7 +21,7 @@ function encode(input, expected, desc) {
 		var a = document.createElement("a"); // <a> uses document encoding for URL's query
 		a.href = "https://example.com/?" + input;
 		result = a.search.substr(1); // remove leading "?"
-		assert_equals(normalizeStr(result), normalizeStr(expected));
+		assert_equals(result, expected);
 	}, desc);
 }
 
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html
index ecf31578e40..033362dc2e5 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-han.html
@@ -166,10 +166,7 @@ function runNext(id) {
     for (var j = 0; j < cplist[i].length; j++) {
       var t = tests[i][j];
       t.step(function() {
-        assert_equals(
-          normalizeStr(results[j]),
-          normalizeStr(cplist[i][j].expected)
-        );
+        assert_equals(results[j], cplist[i][j].expected);
       });
       t.done();
     }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html
index 6290de6d5e2..130980f043b 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-form-errors-misc.html
@@ -175,10 +175,7 @@ function runNext(id) {
     for (var j = 0; j < cplist[i].length; j++) {
       var t = tests[i][j];
       t.step(function() {
-        assert_equals(
-          normalizeStr(results[j]),
-          normalizeStr(cplist[i][j].expected)
-        );
+        assert_equals(results[j], cplist[i][j].expected);
       });
       t.done();
     }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html
index abfddb4db4e..ad334f9fba1 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-han.html
@@ -21,7 +21,7 @@ function encode(input, expected, desc) {
 		var a = document.createElement("a"); // <a> uses document encoding for URL's query
 		a.href = "https://example.com/?" + input;
 		result = a.search.substr(1); // remove leading "?"
-		assert_equals(normalizeStr(result), normalizeStr(expected));
+		assert_equals(result, expected);
 	}, desc);
 }
 
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html
index 6c9f4af8e88..5185963588f 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-korean/euc-kr/euckr-encode-href-errors-misc.html
@@ -21,7 +21,7 @@ function encode(input, expected, desc) {
 		var a = document.createElement("a"); // <a> uses document encoding for URL's query
 		a.href = "https://example.com/?" + input;
 		result = a.search.substr(1); // remove leading "?"
-		assert_equals(normalizeStr(result), normalizeStr(expected));
+		assert_equals(result, expected);
 	}, desc);
 }
 
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html
index 10e33168e44..752956f682e 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBa.html
@@ -136,10 +136,7 @@ function runNext(id) {
         for (var j = 0; j < cplist[i].length; j++) {
             var t = tests[i][j];
             t.step(function() {
-                assert_equals(
-                    normalizeStr(results[j]),
-                    normalizeStr(cplist[i][j].expected)
-                );
+                assert_equals(results[j], cplist[i][j].expected);
             });
             t.done();
         }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html
index 9db97dca7e2..186c7dc43f5 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-extBb.html
@@ -136,10 +136,7 @@ function runNext(id) {
         for (var j = 0; j < cplist[i].length; j++) {
             var t = tests[i][j];
             t.step(function() {
-                assert_equals(
-                    normalizeStr(results[j]),
-                    normalizeStr(cplist[i][j].expected)
-                );
+                assert_equals(results[j], cplist[i][j].expected);
             });
             t.done();
         }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html
index 25e20e8de33..0698ed52265 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-han.html
@@ -178,10 +178,7 @@ function runNext(id) {
     for (var j = 0; j < cplist[i].length; j++) {
       var t = tests[i][j];
       t.step(function() {
-        assert_equals(
-          normalizeStr(results[j]),
-          normalizeStr(cplist[i][j].expected)
-        );
+        assert_equals(results[j], cplist[i][j].expected);
       });
       t.done();
     }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html
index be9cfa41625..106d9d1e3fb 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-hangul.html
@@ -135,10 +135,7 @@ function runNext(id) {
         for (var j = 0; j < cplist[i].length; j++) {
             var t = tests[i][j];
             t.step(function() {
-                assert_equals(
-                    normalizeStr(results[j]),
-                    normalizeStr(cplist[i][j].expected)
-                );
+                assert_equals(results[j], cplist[i][j].expected);
             });
             t.done();
         }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html
index 9ad9b63472b..98d68618664 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-misc.html
@@ -175,10 +175,7 @@ function runNext(id) {
     for (var j = 0; j < cplist[i].length; j++) {
       var t = tests[i][j];
       t.step(function() {
-        assert_equals(
-          normalizeStr(results[j]),
-          normalizeStr(cplist[i][j].expected)
-        );
+        assert_equals(results[j], cplist[i][j].expected);
       });
       t.done();
     }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-pua.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-pua.html
index d60363b25a9..fd037d19ad5 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-pua.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-form-errors-pua.html
@@ -135,10 +135,7 @@ function runNext(id) {
         for (var j = 0; j < cplist[i].length; j++) {
             var t = tests[i][j];
             t.step(function() {
-                assert_equals(
-                    normalizeStr(results[j]),
-                    normalizeStr(cplist[i][j].expected)
-                );
+                assert_equals(results[j], cplist[i][j].expected);
             });
             t.done();
         }
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html
index c7b1a2d4f4b..c538cf4e23e 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-han.html
@@ -21,7 +21,7 @@ function encode(input, expected, desc) {
 		var a = document.createElement("a"); // <a> uses document encoding for URL's query
 		a.href = "https://example.com/?" + input;
 		result = a.search.substr(1); // remove leading "?"
-		assert_equals(normalizeStr(result), normalizeStr(expected));
+		assert_equals(result, expected);
 	}, desc);
 }
 
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html
index ed4033d1f11..48a23f06ab0 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-hangul.html
@@ -21,7 +21,7 @@ function encode(input, expected, desc) {
     var a = document.createElement("a"); // <a> uses document encoding for URL's query
     a.href = "https://example.com/?" + input;
     result = a.search.substr(1); // remove leading "?"
-    assert_equals(normalizeStr(result), normalizeStr(expected));
+    assert_equals(result, expected);
   }, desc);
 }
 
diff --git a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html
index 488eec5ea6d..0ff27f4f120 100644
--- a/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html
+++ b/tests/wpt/web-platform-tests/encoding/legacy-mb-tchinese/big5/big5-encode-href-errors-misc.html
@@ -21,7 +21,7 @@ function encode(input, expected, desc) {
 		var a = document.createElement("a"); // <a> uses document encoding for URL's query
 		a.href = "https://example.com/?" + input;
 		result = a.search.substr(1); // remove leading "?"
-		assert_equals(normalizeStr(result), normalizeStr(expected));
+		assert_equals(result, expected);
 	}, desc);
 }
 
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/document-stream-insertion.tentative.html b/tests/wpt/web-platform-tests/feature-policy/experimental-features/document-stream-insertion.tentative.html
new file mode 100644
index 00000000000..12b844c3dad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/feature-policy/experimental-features/document-stream-insertion.tentative.html
@@ -0,0 +1,82 @@
+<!doctype html>
+<title>'document-stream-insertion' tests</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/feature-policy/experimental-features/resources/common.js"></script>
+<style>
+html, body {
+  height: 100%;
+  width: 100%;
+}
+</style>
+<iframe></iframe>
+<script>
+  "use strict";
+
+  let iframeElement = document.querySelector("iframe");
+  let url = url_base + "document-stream-insertion.html";
+
+  let text_to_write = "<div>FOO<\/div>";
+  let test_cases = [{
+                      api: "open",
+                      query: "body",
+                      expected_value_enabled: false,
+                    },
+                    {
+                      api: "close"
+                    },
+                    {
+                      api: "write",
+                      args: text_to_write,
+                      query: "div",
+                      expected_value_enabled: "FOO"
+                    },
+                    {
+                      api: "writeln",
+                      args: text_to_write,
+                      query: "div",
+                      expected_value_enabled: "FOO"
+                    }];
+
+  // The feature 'document-stream-insertion' is enabled by default and when it
+  // is enabled, all dynamic markup insertion API work as intended.
+  test_cases.forEach((tc) => {
+    promise_test(async() => {
+      await loadUrlInIframe(iframeElement, url);
+      await sendMessageAndGetResponse(iframeElement.contentWindow, tc).then((response) => {
+        assert_false(
+          response.did_throw_exception,
+          `When feature is disabled, invoking 'document.${tc.api}' should not` +
+          " throw an exception.");
+        if (tc.query) {
+          assert_equals(
+            response.value,
+            tc.expected_value_enabled,
+            `The added script tag by 'document.${tc.api}' must have run.`);
+        }
+      });
+    }, `Verify 'document.${tc.api}' is not normally blocked.` );
+  });
+
+
+  // Disabling 'document-stream-insertion' throws exception on the included API.
+  test_cases.forEach((tc) => {
+    promise_test(async() => {
+      setFeatureState(iframeElement, "document-stream-insertion", "'none'");
+      await loadUrlInIframe(iframeElement, url);
+      await sendMessageAndGetResponse(iframeElement.contentWindow, tc).then((response) => {
+        assert_true(
+          response.did_throw_exception,
+          `When feature is enabled, invoking 'document.${tc.api}' should ` +
+          " throw an exception.");
+        if (tc.query) {
+          assert_not_equals(
+            response.value,
+            tc.expected_value_enabled,
+            `The added script tag by 'document.${tc.api}' must not have run.`);
+        }
+      });
+    }, `Verify 'document.${tc.api}' is blocked when the feature is disabled.` );
+  });
+
+</script>
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/common.js b/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/common.js
new file mode 100644
index 00000000000..08d3aef9874
--- /dev/null
+++ b/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/common.js
@@ -0,0 +1,34 @@
+const url_base = "/feature-policy/experimental-features/resources/";
+window.messageResponseCallback = null;
+
+function setFeatureState(iframe, feature, origins) {
+    iframe.setAttribute("allow", `${feature} ${origins};`);
+}
+
+// Returns a promise which is resolved when the <iframe> is navigated to |url|
+// and "load" handler has been called.
+function loadUrlInIframe(iframe, url) {
+  return new Promise((resolve) => {
+    iframe.addEventListener("load", resolve);
+    iframe.src = url;
+  });
+}
+
+// Posts |message| to |target| and resolves the promise with the response coming
+// back from |target|.
+function sendMessageAndGetResponse(target, message) {
+  return new Promise((resolve) => {
+    window.messageResponseCallback = resolve;
+    target.postMessage(message, "*");
+  });
+}
+
+
+function onMessage(e) {
+  if (window.messageResponseCallback) {
+    window.messageResponseCallback(e.data);
+    window.messageResponseCallback = null;
+  }
+}
+
+window.addEventListener("message", onMessage);
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/document-stream-insertion.html b/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/document-stream-insertion.html
new file mode 100644
index 00000000000..633fa85e6ac
--- /dev/null
+++ b/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/document-stream-insertion.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<style>
+#spacer {
+  width: 200%;
+  height: 200%;
+}
+</style>
+<body>
+<script>
+  window.addEventListener("message", onMessageReceived);
+
+  function test(api, args) {
+    let did_throw = false;
+    try {
+     document[api](args);
+    } catch(e) {
+      did_throw = true;
+    }
+    return did_throw;
+  }
+
+  function onMessageReceived(e) {
+    let msg = e.data;
+
+    msg.did_throw_exception = test(msg.api, msg.args);
+    if (msg.query) {
+      let el = document.querySelector(msg.query);
+      msg.value = el ? el.innerHTML : false;
+    }
+    ackMessage(msg, e.source);
+  }
+
+  function ackMessage(msg, source) {
+    source.postMessage(msg, "*");
+  }
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll.js b/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll.js
index bbae658c7e1..88835cc6024 100644
--- a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll.js
+++ b/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll.js
@@ -1,6 +1,3 @@
-const url_base = "/feature-policy/experimental-features/resources/";
-window.messageResponseCallback = null;
-
 function rectMaxY(rect) {
   return rect.height + rect.y;
 }
@@ -23,33 +20,6 @@ function rects_intersect(rect1, rect2) {
          rect2.y < rectMaxY(rect1);
 }
 
-// Returns a promise which is resolved when the <iframe> is navigated to |url|
-// and "load" handler has been called.
-function loadUrlInIframe(iframe, url) {
-  return new Promise((resolve) => {
-    iframe.addEventListener("load", resolve);
-    iframe.src = url;
-  });
-}
-
-// Posts |message| to |target| and resolves the promise with the response coming
-// back from |target|.
-function sendMessageAndGetResponse(target, message) {
-  return new Promise((resolve) => {
-    window.messageResponseCallback = resolve;
-    target.postMessage(message, "*");
-  });
-}
-
 function rectToString(rect) {
   return `Location: (${rect.x}, ${rect.y}) Size: (${rect.width}, ${rect.height})`;
 }
-
-function onMessage(e) {
-  if (window.messageResponseCallback) {
-    window.messageResponseCallback(e.data);
-    window.messageResponseCallback = null;
-  }
-}
-
-window.addEventListener("message", onMessage);
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-scrollintoview.tentative.html b/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-scrollintoview.tentative.html
index e9c7cba2022..689685a4977 100644
--- a/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-scrollintoview.tentative.html
+++ b/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-scrollintoview.tentative.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/feature-policy/experimental-features/resources/common.js"></script>
 <script src="/feature-policy/experimental-features/resources/vertical-scroll.js"></script>
 <style>
 html, body {
@@ -73,7 +74,7 @@ iframe {
   // of disabled frames (does not propagate to main frame).
   promise_test(async() => {
     window.scrollTo(0, 0);
-    iframeElement.allow = "vertical-scroll 'none';";
+    setFeatureState(iframeElement, "vertical-scroll", "'none'");
     await loadUrlInIframe(iframeElement, url);
 
     await sendMessageAndGetResponse(
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html b/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html
index 761c0d759e3..ed6bff14583 100644
--- a/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html
+++ b/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html
@@ -2,6 +2,7 @@
 <title>vertical-scroll test for touch-action</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src="/feature-policy/experimental-features/resources/common.js"></script>
 <script src="/feature-policy/experimental-features/resources/vertical-scroll.js"></script>
 <style>
 html, body {
@@ -81,7 +82,7 @@ iframe {
     window.scrollTo(0, 0);
 
     // Disallow vertical scroll and reload the <iframe>.
-    iframeElement.setAttribute("allow", "vertical-scroll 'none';");
+    setFeatureState(iframeElement, "vertical-scroll", "'none'");
     await loadUrlInIframe(iframeElement, url);
 
     // Apply the scroll gesture. Main frame should scroll vertically.
diff --git a/tests/wpt/web-platform-tests/fetch/api/request/resources/cache.py b/tests/wpt/web-platform-tests/fetch/api/request/resources/cache.py
index e0b058bddf6..10122f64396 100644
--- a/tests/wpt/web-platform-tests/fetch/api/request/resources/cache.py
+++ b/tests/wpt/web-platform-tests/fetch/api/request/resources/cache.py
@@ -49,10 +49,10 @@ def main(request, response):
 
     # The only-if-cached redirect tests wants CORS to be okay, the other tests
     # are all same-origin anyways and don't care.
-    response.headers.set("Access-Control-Allow-Origin", "*");
+    response.headers.set("Access-Control-Allow-Origin", "*")
 
     if redirect:
-        response.headers.set("Location", redirect);
+        response.headers.set("Location", redirect)
         response.status = (302, "Redirect")
         return ""
     elif ((inm is not None and inm == tag) or
diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/authentication.py b/tests/wpt/web-platform-tests/fetch/api/resources/authentication.py
index a06d179e58e..b65047d7657 100644
--- a/tests/wpt/web-platform-tests/fetch/api/resources/authentication.py
+++ b/tests/wpt/web-platform-tests/fetch/api/resources/authentication.py
@@ -12,4 +12,3 @@ def main(request, response):
     return ((401, "Unauthorized"),
             [("WWW-Authenticate", 'Basic realm="' + realm + '"')],
             "Please login with credentials 'user' and 'password'")
-
diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/bad-chunk-encoding.py b/tests/wpt/web-platform-tests/fetch/api/resources/bad-chunk-encoding.py
index 3135403863b..23c7b3f47c4 100644
--- a/tests/wpt/web-platform-tests/fetch/api/resources/bad-chunk-encoding.py
+++ b/tests/wpt/web-platform-tests/fetch/api/resources/bad-chunk-encoding.py
@@ -6,7 +6,7 @@ def main(request, response):
     time.sleep(delay)
     response.headers.set("Transfer-Encoding", "chunked")
     response.write_status_headers()
-    time.sleep(delay);
+    time.sleep(delay)
     for i in xrange(count):
         response.writer.write_content("a\r\nTEST_CHUNK\r\n")
         time.sleep(delay)
diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/inspect-headers.py b/tests/wpt/web-platform-tests/fetch/api/resources/inspect-headers.py
index d53038cee0b..b6840cf021a 100644
--- a/tests/wpt/web-platform-tests/fetch/api/resources/inspect-headers.py
+++ b/tests/wpt/web-platform-tests/fetch/api/resources/inspect-headers.py
@@ -4,8 +4,8 @@ def main(request, response):
     if "headers" in request.GET:
         checked_headers = request.GET.first("headers").split("|")
         for header in checked_headers:
-          if header in request.headers:
-              headers.append(("x-request-" + header, request.headers.get(header, "") ))
+            if header in request.headers:
+                headers.append(("x-request-" + header, request.headers.get(header, "")))
 
     if "cors" in request.GET:
         if "Origin" in request.headers:
diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/preflight.py b/tests/wpt/web-platform-tests/fetch/api/resources/preflight.py
index 6263eaef621..5f4076aa682 100644
--- a/tests/wpt/web-platform-tests/fetch/api/resources/preflight.py
+++ b/tests/wpt/web-platform-tests/fetch/api/resources/preflight.py
@@ -59,12 +59,12 @@ def main(request, response):
     headers.append(("Access-Control-Expose-Headers", "x-did-preflight, x-control-request-headers, x-referrer, x-preflight-referrer, x-origin"))
     headers.append(("x-did-preflight", stashed_data['preflight']))
     if stashed_data['control_request_headers'] != None:
-      headers.append(("x-control-request-headers", stashed_data['control_request_headers']))
+        headers.append(("x-control-request-headers", stashed_data['control_request_headers']))
     headers.append(("x-preflight-referrer", stashed_data['preflight_referrer']))
-    headers.append(("x-referrer", request.headers.get("Referer", "") ))
-    headers.append(("x-origin", request.headers.get("Origin", "") ))
+    headers.append(("x-referrer", request.headers.get("Referer", "")))
+    headers.append(("x-origin", request.headers.get("Origin", "")))
 
     if token:
-      request.server.stash.put(token, stashed_data)
+        request.server.stash.put(token, stashed_data)
 
     return headers, ""
diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/redirect.py b/tests/wpt/web-platform-tests/fetch/api/resources/redirect.py
index 40c1b99961a..8e6f9c24b77 100644
--- a/tests/wpt/web-platform-tests/fetch/api/resources/redirect.py
+++ b/tests/wpt/web-platform-tests/fetch/api/resources/redirect.py
@@ -28,7 +28,7 @@ def main(request, response):
         #Preflight is not redirected: return 200
         if not "redirect_preflight" in request.GET:
             if token:
-              request.server.stash.put(request.GET.first("token"), stashed_data)
+                request.server.stash.put(request.GET.first("token"), stashed_data)
             return 200, headers, ""
 
     if "redirect_status" in request.GET:
@@ -59,7 +59,7 @@ def main(request, response):
     if token:
         request.server.stash.put(request.GET.first("token"), stashed_data)
         if "max_count" in request.GET:
-            max_count =  int(request.GET['max_count'])
+            max_count = int(request.GET['max_count'])
             #stop redirecting and return count
             if stashed_data['count'] > max_count:
                 # -1 because the last is not a redirection
diff --git a/tests/wpt/web-platform-tests/fetch/api/resources/trickle.py b/tests/wpt/web-platform-tests/fetch/api/resources/trickle.py
index 319ecd21f45..e2c9beec1e0 100644
--- a/tests/wpt/web-platform-tests/fetch/api/resources/trickle.py
+++ b/tests/wpt/web-platform-tests/fetch/api/resources/trickle.py
@@ -8,7 +8,7 @@ def main(request, response):
     time.sleep(delay)
     response.headers.set("Content-type", "text/plain")
     response.write_status_headers()
-    time.sleep(delay);
+    time.sleep(delay)
     for i in xrange(count):
         response.writer.write_content("TEST_TRICKLE\n")
         time.sleep(delay)
diff --git a/tests/wpt/web-platform-tests/fetch/http-cache/resources/http-cache.py b/tests/wpt/web-platform-tests/fetch/http-cache/resources/http-cache.py
index aedd52e51ae..4410500d9ac 100644
--- a/tests/wpt/web-platform-tests/fetch/http-cache/resources/http-cache.py
+++ b/tests/wpt/web-platform-tests/fetch/http-cache/resources/http-cache.py
@@ -30,7 +30,7 @@ def main(request, response):
             noted_headers[header[0].lower()] = header[1]
 
     if "access-control-allow-origin" not in noted_headers:
-        response.headers.set("Access-Control-Allow-Origin", "*");
+        response.headers.set("Access-Control-Allow-Origin", "*")
     if "content-type" not in noted_headers:
         response.headers.set("Content-Type", "text/plain")
     response.headers.set("Server-Request-Count", len(server_state))
diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/resources/css.py b/tests/wpt/web-platform-tests/fetch/nosniff/resources/css.py
index 55712c5e23e..f283e785d90 100644
--- a/tests/wpt/web-platform-tests/fetch/nosniff/resources/css.py
+++ b/tests/wpt/web-platform-tests/fetch/nosniff/resources/css.py
@@ -6,18 +6,18 @@ def main(request, response):
 
     response.add_required_headers = False
     if is_revalidation is not None:
-      response.writer.write_status(304)
-      response.writer.write_header("x-content-type-options", "nosniff")
-      response.writer.write_header("content-length", 0)
-      if(type != None):
-        response.writer.write_header("content-type", type)
-      response.writer.end_headers()
-      response.writer.write("")
+        response.writer.write_status(304)
+        response.writer.write_header("x-content-type-options", "nosniff")
+        response.writer.write_header("content-length", 0)
+        if(type != None):
+            response.writer.write_header("content-type", type)
+        response.writer.end_headers()
+        response.writer.write("")
     else:
-      response.writer.write_status(200)
-      response.writer.write_header("x-content-type-options", "nosniff")
-      response.writer.write_header("content-length", len(content))
-      if(type != None):
-        response.writer.write_header("content-type", type)
-      response.writer.end_headers()
-      response.writer.write(content)
+        response.writer.write_status(200)
+        response.writer.write_header("x-content-type-options", "nosniff")
+        response.writer.write_header("content-length", len(content))
+        if(type != None):
+            response.writer.write_header("content-type", type)
+        response.writer.end_headers()
+        response.writer.write(content)
diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/resources/image.py b/tests/wpt/web-platform-tests/fetch/nosniff/resources/image.py
index 623a40d58c1..a19ff1f3a07 100644
--- a/tests/wpt/web-platform-tests/fetch/nosniff/resources/image.py
+++ b/tests/wpt/web-platform-tests/fetch/nosniff/resources/image.py
@@ -4,9 +4,9 @@ def main(request, response):
     type = request.GET.first("type", None)
 
     if type != None and "svg" in type:
-      filename = "green-96x96.svg"
+        filename = "green-96x96.svg"
     else:
-      filename = "blue96x96.png"
+        filename = "blue96x96.png"
 
     path = os.path.join(os.path.dirname(__file__), "../../../images", filename)
     body = open(path, "rb").read()
@@ -16,7 +16,7 @@ def main(request, response):
     response.writer.write_header("x-content-type-options", "nosniff")
     response.writer.write_header("content-length", len(body))
     if(type != None):
-      response.writer.write_header("content-type", type)
+        response.writer.write_header("content-type", type)
     response.writer.end_headers()
 
     response.writer.write(body)
diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/resources/js.py b/tests/wpt/web-platform-tests/fetch/nosniff/resources/js.py
index 0c06d9cd2e4..4fb7fb66008 100644
--- a/tests/wpt/web-platform-tests/fetch/nosniff/resources/js.py
+++ b/tests/wpt/web-platform-tests/fetch/nosniff/resources/js.py
@@ -11,7 +11,7 @@ def main(request, response):
     response.writer.write_header("x-content-type-options", "nosniff")
     response.writer.write_header("content-length", len(content))
     if(type != "Content-Type missing"):
-      response.writer.write_header("content-type", type)
+        response.writer.write_header("content-type", type)
     response.writer.end_headers()
 
     response.writer.write(content)
diff --git a/tests/wpt/web-platform-tests/fetch/nosniff/resources/worker.py b/tests/wpt/web-platform-tests/fetch/nosniff/resources/worker.py
index 3903ba34947..a06a3a22378 100644
--- a/tests/wpt/web-platform-tests/fetch/nosniff/resources/worker.py
+++ b/tests/wpt/web-platform-tests/fetch/nosniff/resources/worker.py
@@ -10,7 +10,7 @@ def main(request, response):
     response.writer.write_header("x-content-type-options", "nosniff")
     response.writer.write_header("content-length", len(content))
     if(type != None):
-      response.writer.write_header("content-type", type)
+        response.writer.write_header("content-type", type)
     response.writer.end_headers()
 
     response.writer.write(content)
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/README.md b/tests/wpt/web-platform-tests/fetch/sec-metadata/README.md
new file mode 100644
index 00000000000..c460aa1ecb9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/README.md
@@ -0,0 +1,11 @@
+`Sec-Metadata` Tests
+====================
+
+This directory contains tests related to the `Sec-Metadata` proposal:
+
+:   Explainer
+::  <https://github.com/mikewest/sec-metadata>
+:   "Spec"
+::  <https://mikewest.github.io/sec-metadata/>
+
+Note: All of this is tentative, and will change (rapidly).
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/fetch.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/sec-metadata/fetch.tentative.https.sub.html
new file mode 100644
index 00000000000..1128218b4e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/fetch.tentative.https.sub.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/fetch/sec-metadata/resources/helper.js></script>
+<script>
+  promise_test(t => {
+    return fetch("https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-json.py")
+        .then(r => r.json())
+        .then(j => {
+          assert_header_equals(j.header, {
+            "cause": "forced",
+            "destination": "\"\"",
+            "target": "subresource",
+            "site": "same-origin"
+          });
+        });
+  }, "Same-origin fetch");
+
+  promise_test(t => {
+    return fetch("https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-json.py")
+        .then(r => r.json())
+        .then(j => {
+          assert_header_equals(j.header, {
+            "cause": "forced",
+            "destination": "\"\"",
+            "target": "subresource",
+            "site": "same-site"
+          });
+        });
+  }, "Same-site fetch");
+
+  promise_test(t => {
+    return fetch("https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-json.py")
+        .then(r => r.json())
+        .then(j => {
+          assert_header_equals(j.header, {
+            "cause": "forced",
+            "destination": "\"\"",
+            "target": "subresource",
+            "site": "cross-site"
+          });
+        });
+  }, "Cross-site fetch");
+</script>
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/iframe.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/sec-metadata/iframe.tentative.https.sub.html
new file mode 100644
index 00000000000..5b56c62ad71
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/iframe.tentative.https.sub.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/fetch/sec-metadata/resources/helper.js></script>
+<body>
+<script>
+  async_test(t => {
+    let i = document.createElement('iframe');
+    i.src = "https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/post-to-owner.py";
+    window.addEventListener('message', t.step_func(e => {
+      if (e.source != i.contentWindow)
+        return;
+
+      assert_header_equals(e.data, {
+        "cause": "forced",
+        "destination": "document",
+        "target": "nested",
+        "site": "same-origin"
+      });
+      t.done();
+    }));
+
+    document.body.appendChild(i);
+  }, "Same-origin iframe");
+
+  async_test(t => {
+    let i = document.createElement('iframe');
+    i.src = "https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/post-to-owner.py";
+    window.addEventListener('message', t.step_func(e => {
+      if (e.source != i.contentWindow)
+        return;
+
+      assert_header_equals(e.data, {
+        "cause": "forced",
+        "destination": "document",
+        "target": "nested",
+        "site": "same-site"
+      });
+      t.done();
+    }));
+
+    document.body.appendChild(i);
+  }, "Same-site iframe");
+
+  async_test(t => {
+    let i = document.createElement('iframe');
+    i.src = "https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/post-to-owner.py";
+    window.addEventListener('message', t.step_func(e => {
+      if (e.source != i.contentWindow)
+        return;
+
+      assert_header_equals(e.data, {
+        "cause": "forced",
+        "destination": "document",
+        "target": "nested",
+        "site": "cross-site"
+      });
+      t.done();
+    }));
+
+    document.body.appendChild(i);
+  }, "Cross-site iframe");
+</script>
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/img.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/sec-metadata/img.tentative.https.sub.html
new file mode 100644
index 00000000000..9d17462ea46
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/img.tentative.https.sub.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/referrer-policy/generic/common.js></script>
+<script src=/fetch/sec-metadata/resources/helper.js></script>
+<body>
+<script>
+  // These tests reuse the `referrer-policy` infrastructure to load images that
+  // encode their request headers in their pixels. Fun stuff!
+  async_test(t => {
+    loadImageInWindow(
+      "https://{{host}}:{{ports[https][0]}}/referrer-policy/generic/subresource/image.py",
+      t.step_func_done(img => {
+        assert_header_equals(decodeImageData(extractImageData(img)).headers["sec-metadata"], {
+          "cause": "forced",
+          "destination": "image",
+          "target": "subresource",
+          "site": "same-origin"
+        });
+      }),
+      [],
+      window);
+  }, "Same-origin image");
+
+  async_test(t => {
+    loadImageInWindow(
+      "https://{{hosts[][www]}}:{{ports[https][0]}}/referrer-policy/generic/subresource/image.py",
+      t.step_func_done(img => {
+        assert_header_equals(decodeImageData(extractImageData(img)).headers["sec-metadata"], {
+          "cause": "forced",
+          "destination": "image",
+          "target": "subresource",
+          "site": "same-site"
+        });
+      }),
+      [],
+      window);
+  }, "Same-site image");
+
+  async_test(t => {
+    loadImageInWindow(
+      "https://{{hosts[alt][www]}}:{{ports[https][0]}}/referrer-policy/generic/subresource/image.py",
+      t.step_func_done(img => {
+        assert_header_equals(decodeImageData(extractImageData(img)).headers["sec-metadata"], {
+          "cause": "forced",
+          "destination": "image",
+          "target": "subresource",
+          "site": "cross-site"
+        });
+      }),
+      [],
+      window);
+  }, "Cross-site image");
+</script>
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/echo-as-json.py b/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/echo-as-json.py
new file mode 100644
index 00000000000..a45bb686546
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/echo-as-json.py
@@ -0,0 +1,12 @@
+import json
+
+def main(request, response):
+    headers = [("Content-Type", "application/json"),
+               ("Access-Control-Allow-Credentials", "true")]
+
+    if "origin" in request.headers:
+        headers.append(("Access-Control-Allow-Origin", request.headers["origin"]))
+
+
+    body = json.dumps({ "header": request.headers["sec-metadata"] })
+    return headers, body
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/echo-as-script.py b/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/echo-as-script.py
new file mode 100644
index 00000000000..c503822d5c6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/echo-as-script.py
@@ -0,0 +1,8 @@
+import json
+
+def main(request, response):
+    headers = [("Content-Type", "text/javascript")]
+
+    body = "var header = %s;" % json.dumps(request.headers["sec-metadata"]);
+
+    return headers, body
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/helper.js b/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/helper.js
new file mode 100644
index 00000000000..5754b5009e3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/helper.js
@@ -0,0 +1,16 @@
+function parse_metadata(value) {
+  let result = {};
+  value.split(',').forEach(item => {
+    let parsed = item.trim().split('=');
+    result[parsed[0]] = parsed[1];
+  });
+  return result;
+}
+
+function assert_header_equals(value, expected) {
+  let result = parse_metadata(value);
+  assert_equals(result.cause, expected.cause, "cause");
+  assert_equals(result.destination, expected.destination, "destination");
+  assert_equals(result.target, expected.target, "target");
+  assert_equals(result.site, expected.site, "site");
+}
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/post-to-owner.py b/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/post-to-owner.py
new file mode 100644
index 00000000000..fe08cd1cbca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/post-to-owner.py
@@ -0,0 +1,16 @@
+import json
+
+def main(request, response):
+    headers = [("Content-Type", "text/html")]
+
+    body = """
+        <!DOCTYPE html>
+        <script>
+            var data = %s;
+            if (window.opener)
+                window.opener.postMessage(data, "*");
+            if (window.top != window)
+                window.top.postMessage(data, "*");
+        </script>
+    """ % json.dumps(request.headers["sec-metadata"])
+    return headers, body
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/script.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/sec-metadata/script.tentative.https.sub.html
new file mode 100644
index 00000000000..1916f670c33
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/script.tentative.https.sub.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/fetch/sec-metadata/resources/helper.js></script>
+
+<!-- Same-origin script -->
+<script src="https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-script.py"></script>
+<script>
+  test(t => {
+    t.add_cleanup(_ => header = null);
+
+    assert_header_equals(header, {
+      "cause": "forced",
+      "destination": "script",
+      "target": "subresource",
+      "site": "same-origin"
+    });
+  }, "Same-origin script");
+</script>
+
+<!-- Same-site script -->
+<script src="https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-script.py"></script>
+<script>
+  test(t => {
+    t.add_cleanup(_ => header = null);
+
+    assert_header_equals(header, {
+      "cause": "forced",
+      "destination": "script",
+      "target": "subresource",
+      "site": "same-site"
+    });
+  }, "Same-site script");
+</script>
+
+<!-- Cross-site script -->
+<script src="https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/echo-as-script.py"></script>
+<script>
+  test(t => {
+    t.add_cleanup(_ => header = null);
+
+    assert_header_equals(header, {
+      "cause": "forced",
+      "destination": "script",
+      "target": "subresource",
+      "site": "cross-site"
+    });
+  }, "Cross-site script");
+</script>
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/window-open.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/sec-metadata/window-open.tentative.https.sub.html
new file mode 100644
index 00000000000..1f9df663f1d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/window-open.tentative.https.sub.html
@@ -0,0 +1,127 @@
+<!DOCTYPE html>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/resources/testdriver.js></script>
+<script src=/resources/testdriver-vendor.js></script>
+<script src=/fetch/sec-metadata/resources/helper.js></script>
+<body>
+<script>
+  // Forced navigations:
+  async_test(t => {
+    let w = window.open("https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/post-to-owner.py");
+    t.add_cleanup(_ => w.close());
+    window.addEventListener('message', t.step_func(e => {
+      if (e.source != w)
+        return;
+
+      assert_header_equals(e.data, {
+        "cause": "forced",
+        "destination": "document",
+        "target": "top-level",
+        "site": "same-origin"
+      });
+      t.done();
+    }));
+  }, "Same-origin window, forced");
+
+  async_test(t => {
+    let w = window.open("https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/post-to-owner.py");
+    t.add_cleanup(_ => w.close());
+    window.addEventListener('message', t.step_func(e => {
+      if (e.source != w)
+        return;
+
+      assert_header_equals(e.data, {
+        "cause": "forced",
+        "destination": "document",
+        "target": "top-level",
+        "site": "same-site"
+      });
+      t.done();
+    }));
+  }, "Same-site window, forced");
+
+  async_test(t => {
+    let w = window.open("https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/post-to-owner.py");
+    t.add_cleanup(_ => w.close());
+    window.addEventListener('message', t.step_func(e => {
+      if (e.source != w)
+        return;
+
+      assert_header_equals(e.data, {
+        "cause": "forced",
+        "destination": "document",
+        "target": "top-level",
+        "site": "cross-site"
+      });
+      t.done();
+    }));
+  }, "Cross-site window, forced");
+
+  // User-activated navigations:
+  async_test(t => {
+    let b = document.createElement('button');
+    b.onclick = t.step_func(_ => {
+      let w = window.open("https://{{host}}:{{ports[https][0]}}/fetch/sec-metadata/resources/post-to-owner.py");
+      t.add_cleanup(_ => w.close());
+      window.addEventListener('message', t.step_func(e => {
+        if (e.source != w)
+          return;
+
+        assert_header_equals(e.data, {
+          "cause": "user-activated",
+          "destination": "document",
+          "target": "top-level",
+          "site": "same-origin"
+        });
+        t.done();
+      }));
+    });
+    document.body.appendChild(b);
+    test_driver.click(b);
+  }, "Same-origin window, user-activated");
+
+  async_test(t => {
+    let b = document.createElement('button');
+    b.onclick = t.step_func(_ => {
+      let w = window.open("https://{{hosts[][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/post-to-owner.py");
+      t.add_cleanup(_ => w.close());
+      window.addEventListener('message', t.step_func(e => {
+        if (e.source != w)
+          return;
+
+        assert_header_equals(e.data, {
+          "cause": "user-activated",
+          "destination": "document",
+          "target": "top-level",
+          "site": "same-site"
+        });
+        t.done();
+      }));
+    });
+    document.body.appendChild(b);
+    test_driver.click(b);
+  }, "Same-site window, user-activated");
+
+  async_test(t => {
+    let b = document.createElement('button');
+    b.onclick = t.step_func(_ => {
+      let w = window.open("https://{{hosts[alt][www]}}:{{ports[https][0]}}/fetch/sec-metadata/resources/post-to-owner.py");
+      t.add_cleanup(_ => w.close());
+      window.addEventListener('message', t.step_func(e => {
+        if (e.source != w)
+          return;
+
+        assert_header_equals(e.data, {
+          "cause": "user-activated",
+          "destination": "document",
+          "target": "top-level",
+          "site": "cross-site"
+        });
+        t.done();
+      }));
+    });
+    document.body.appendChild(b);
+    test_driver.click(b);
+  }, "Cross-site window, user-activated");
+</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding-2.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding-2.html
new file mode 100644
index 00000000000..cd2502ab1cb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding-2.html
@@ -0,0 +1,41 @@
+<!doctype html>
+<meta charset=windows-1252>
+<title>Fragment navigation: encoding</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<div style=height:10000px></div>
+<div id=&#xFFFD;></div>
+<div id=&#xFEFF;&#xFFFD;></div>
+<script>
+function goToTop() {
+  location.hash = "top";
+  assert_equals(self.scrollY, 0, "#top");
+}
+
+test(() => {
+  assert_equals(location.hash, "", "Page must be loaded with no hash");
+
+  location.hash = "%C2";
+  assert_equals(location.hash, "#%C2");
+  assert_greater_than(self.scrollY, 1000, "#%C2");
+}, "Invalid percent-encoded UTF-8 byte should decode as U+FFFD");
+
+test(() => {
+  goToTop();
+
+  location.hash = "%EF%BB%BF%C2";
+  assert_equals(location.hash, "#%EF%BB%BF%C2");
+  assert_greater_than(self.scrollY, 1000, "#%EF%BB%BF%C2");
+}, "Percent-encoded UTF-8 BOM followed by invalid UTF-8 byte should decode as U+FEFF U+FFFD");
+
+test(() => {
+  goToTop();
+
+  location.hash = "%EF%BF%BD";
+  assert_equals(location.hash, "#%EF%BF%BD");
+  assert_greater_than(self.scrollY, 1000, "#%EF%BF%BD");
+
+  goToTop();
+}, "Percent-encoded UTF-8 byte sequence for U+FFFD should decode as U+FFFD");
+</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding.html
new file mode 100644
index 00000000000..c971911f997
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/scroll-to-fragid/fragment-and-encoding.html
@@ -0,0 +1,37 @@
+<!doctype html>
+<meta charset=windows-1252>
+<title>Fragment navigation: encoding</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<div style=height:10000px></div>
+<div id=&#xFF;></div>
+<div id=&#xFEFF;></div>
+<script>
+function goToTop() {
+  location.hash = "top";
+  assert_equals(self.scrollY, 0, "#top");
+}
+
+test(() => {
+  assert_equals(location.hash, "", "Page must be loaded with no hash");
+
+  location.hash = "\u00FF";
+  assert_equals(location.hash, "#%C3%BF");
+  assert_greater_than(self.scrollY, 1000, "#%C3%BF");
+}, "U+00FF should find U+00FF");
+
+test(() => {
+  goToTop();
+
+  location.hash = "%EF%BB%BF";
+  assert_greater_than(self.scrollY, 1000, "#%EF%BB%BF");
+}, "Percent-encoded UTF-8 BOM should find U+FEFF as BOM is not stripped when decoding");
+
+test(() => {
+  goToTop();
+
+  location.hash = "%FF";
+  assert_equals(self.scrollY, 0, "#%FF");
+}, "%FF should not find U+00FF as decoding it gives U+FFFD");
+</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html
index d7131b00db9..d6ecf5d52f3 100644
--- a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html
+++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html
@@ -15,7 +15,10 @@ onload = function() {setTimeout(function() {
 
   iframe.onload = function() {
                     setTimeout(function() {iframe.contentWindow.location="navigation-within-beforeunload-2.html";}, 100);
-                    iframe.onload = t.step_func(function() {assert_equals(counter, 1000); t.done()});
+                    // Step 4 of https://html.spec.whatwg.org/multipage/browsing-the-web.html#navigating-across-documents
+                    // doesn't seem to allow navigation within a beforeunload handler,
+                    // so the counter should not go beyond 1.
+                    iframe.onload = t.step_func(function() {assert_equals(counter, 1); t.done()});
                   };
 
   iframe.src = "navigation-within-beforeunload-1.html?" + Math.random();
diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html b/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html
index b1a4d5bd863..3ad228b0b27 100644
--- a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html
+++ b/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html
@@ -9,7 +9,7 @@
 function expected(encoding) {
   return "?" + {
     "UTF-8": "%C3%BF",
-    "windows-1251": "&%23255;",
+    "windows-1251": "%26%23255%3B",
     "windows-1252": "%FF"
   }[encoding];
 }
diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js b/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
index 0d14fe70f07..9e0f7f53135 100644
--- a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
+++ b/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
@@ -17,7 +17,7 @@ onload = function() {
     'utf-16be':'%C3%A5',
     'utf-16le':'%C3%A5',
     'windows-1252':'%E5',
-    'windows-1251':'&%23229;'
+    'windows-1251':'%26%23229%3B'
   };
   var expected_current = expected_obj[encoding];
   var expected_utf8 = expected_obj['utf-8'];
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track-inband.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track-inband.html
new file mode 100644
index 00000000000..7dcfe68318a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track-inband.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+        <script src="/common/media.js"></script>
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+    </head>
+    <body>
+        <script>
+            async_test(function(test)
+            {
+                var video = document.createElement("video");
+
+                // Create an out-of-band text track by adding a track element.
+                var trackElement = document.createElement('track');
+
+                trackElement.addEventListener("error", test.step_func(function()
+                {
+                    assert_unreached("'error' event on track element should not fire.")
+                }));
+
+                video.appendChild(trackElement);
+                trackElement.src = 'resources/webvtt-file.vtt';
+                trackElement.track.mode = 'hidden';
+
+                assert_equals(video.textTracks.length, 1);
+                var outOfBandTrack = video.textTracks[0];
+
+                // Load a media file with an inband text track.
+                var inbandTrack = null;
+                var url = "resources/vp8-vorbis-webvtt.webm"
+
+                var firstAddTrackHandler = test.step_func(function()
+                {
+                    assert_equals(event.target, video.textTracks);
+                    assert_equals(event instanceof window.TrackEvent, true);
+                    if (event.track == outOfBandTrack) {
+                        return;
+                    }
+
+                    assert_equals(inbandTrack, null);
+                    assert_equals(video.textTracks.length, 2);
+                    assert_equals(event.track, video.textTracks[1]);
+                    inbandTrack = event.track;
+
+                    video.textTracks.removeEventListener("addtrack", firstAddTrackHandler);
+
+                    // Clear .src to force the inband track to get destroyed.
+                    video.src = "";
+
+                    // Verify that the inband track was removed.
+                    assert_not_equals(inbandTrack, null);
+                    assert_equals(video.textTracks.length, 1);
+                    assert_equals(video.textTracks[0], outOfBandTrack);
+
+                    // Load the URL again to trigger another 'addtrack' event to make sure
+                    // no 'removetrack' event was queued.
+                    video.src = url;
+                    video.textTracks.addEventListener("addtrack", test.step_func(function()
+                    {
+                        assert_equals(video.textTracks.length, 2);
+                        test.done();
+                    }));
+                });
+                video.textTracks.addEventListener("addtrack", firstAddTrackHandler);
+
+                video.textTracks.addEventListener("removetrack", test.step_func(function()
+                {
+                    assert_unreached("'removetrack' event should not fire.")
+                }));
+
+                video.src = url;
+            }, "Tests that the 'removetrack' event is NOT fired for inband TextTrack on a failed load.");
+
+        </script>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track.html
index 29938e31029..d5695cd302d 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/media-elements/track/track-element/track-remove-track.html
@@ -34,72 +34,6 @@
                 video.removeChild(trackElement);
                 video.textTracks.addEventListener("removetrack", test.step_func(trackRemoved));
             }, "Tests that the 'removetrack' event is fired when an out-of-band TextTrack is removed.");
-
-            async_test(function(test)
-            {
-                var video = document.createElement("video");
-
-                // Create an out-of-band text track by adding a track element.
-                var trackElement = document.createElement('track');
-
-                trackElement.addEventListener("error", test.step_func(function()
-                {
-                    assert_unreached("'error' event on track element should not fire.")
-                }));
-
-                video.appendChild(trackElement);
-                trackElement.src = 'resources/webvtt-file.vtt';
-                trackElement.track.mode = 'hidden';
-
-                assert_equals(video.textTracks.length, 1);
-                var outOfBandTrack = video.textTracks[0];
-
-                // Load a media file with an inband text track.
-                var inbandTrack = null;
-                var url = "resources/vp8-vorbis-webvtt.webm"
-
-                var firstAddTrackHandler = test.step_func(function()
-                {
-                    assert_equals(event.target, video.textTracks);
-                    assert_equals(event instanceof window.TrackEvent, true);
-                    if (event.track == outOfBandTrack) {
-                        return;
-                    }
-
-                    assert_equals(inbandTrack, null);
-                    assert_equals(video.textTracks.length, 2);
-                    assert_equals(event.track, video.textTracks[1]);
-                    inbandTrack = event.track;
-
-                    video.textTracks.removeEventListener("addtrack", firstAddTrackHandler);
-
-                    // Clear .src to force the inband track to get destroyed.
-                    video.src = "";
-
-                    // Verify that the inband track was removed.
-                    assert_not_equals(inbandTrack, null);
-                    assert_equals(video.textTracks.length, 1);
-                    assert_equals(video.textTracks[0], outOfBandTrack);
-
-                    // Load the URL again to trigger another 'addtrack' event to make sure
-                    // no 'removetrack' event was queued.
-                    video.src = url;
-                    video.textTracks.addEventListener("addtrack", test.step_func(function()
-                    {
-                        assert_equals(video.textTracks.length, 2);
-                        test.done();
-                    }));
-                });
-                video.textTracks.addEventListener("addtrack", firstAddTrackHandler);
-
-                video.textTracks.addEventListener("removetrack", test.step_func(function()
-                {
-                    assert_unreached("'removetrack' event should not fire.")
-                }));
-
-                video.src = url;
-            }, "Tests that the 'removetrack' event is NOT fired for inband TextTrack on a failed load.");
-
         </script>
     </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-usv.html b/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-usv.html
index ea5b0dcc899..4ac26092eee 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-usv.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-usv.html
@@ -8,12 +8,13 @@
 <script src="/resources/testharnessreport.js"></script>
 
 <iframe id="testframe" src="form-data-set-usv-form.html"></iframe>
+<iframe id="testframe2" src="form-data-set-usv-form.html"></iframe>
 
 <script>
 "use strict";
 
 async_test(t => {
-  window.onload = t.step_func(() => {
+  window.addEventListener("load", t.step_func(() => {
     const iframe = document.querySelector("#testframe");
     const form = iframe.contentWindow.document.querySelector("form");
 
@@ -35,6 +36,17 @@ async_test(t => {
     });
 
     form.submit();
-  });
-});
+  }));
+}, 'Strings from form controls should be converted to Unicode scalar values in form submission');
+
+async_test(t => {
+  window.addEventListener("load", t.step_func_done(() => {
+    const iframe = document.querySelector("#testframe2");
+    const formData = new FormData(iframe.contentWindow.document.querySelector("form"));
+    assert_equals(formData.get("input1\uFFFD"), "input1\uFFFD");
+    assert_equals(formData.get("input2\uFFFD"), "input2\uFFFD");
+    assert_equals(formData.get("input3\uFFFD"), "input3\uFFFD");
+    assert_equals(formData.get("input4\uFFFD"), "input4\uFFFD");
+  }));
+}, 'Strings from form controls should be converted to Unicode scalar values in FormData');
 </script>
diff --git a/tests/wpt/web-platform-tests/interfaces/battery.idl b/tests/wpt/web-platform-tests/interfaces/battery.idl
new file mode 100644
index 00000000000..2596a6ebe53
--- /dev/null
+++ b/tests/wpt/web-platform-tests/interfaces/battery.idl
@@ -0,0 +1,19 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content of this file was automatically extracted from the Battery Status API spec.
+// See https://w3c.github.io/battery/
+
+partial interface Navigator {
+  Promise<BatteryManager> getBattery();
+};
+
+[Exposed=Window]
+interface BatteryManager : EventTarget {
+    readonly        attribute boolean             charging;
+    readonly        attribute unrestricted double chargingTime;
+    readonly        attribute unrestricted double dischargingTime;
+    readonly        attribute double              level;
+                    attribute EventHandler        onchargingchange;
+                    attribute EventHandler        onchargingtimechange;
+                    attribute EventHandler        ondischargingtimechange;
+                    attribute EventHandler        onlevelchange;
+};
diff --git a/tests/wpt/web-platform-tests/interfaces/gamepad.idl b/tests/wpt/web-platform-tests/interfaces/gamepad.idl
index 0f7ca2c4702..575e12a3d1e 100644
--- a/tests/wpt/web-platform-tests/interfaces/gamepad.idl
+++ b/tests/wpt/web-platform-tests/interfaces/gamepad.idl
@@ -1,33 +1,37 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content of this file was automatically extracted from the Gamepad spec.
+// See https://w3c.github.io/gamepad/
+
 interface Gamepad {
-    readonly attribute DOMString                  id;
-    readonly attribute long                       index;
-    readonly attribute boolean                    connected;
-    readonly attribute DOMHighResTimeStamp        timestamp;
-    readonly attribute GamepadMappingType         mapping;
-    readonly attribute FrozenArray<double>        axes;
-    readonly attribute FrozenArray<GamepadButton> buttons;
+  readonly attribute DOMString id;
+  readonly attribute long index;
+  readonly attribute boolean connected;
+  readonly attribute DOMHighResTimeStamp timestamp;
+  readonly attribute GamepadMappingType mapping;
+  readonly attribute FrozenArray<double> axes;
+  readonly attribute FrozenArray<GamepadButton> buttons;
 };
 
 interface GamepadButton {
-    readonly attribute boolean pressed;
-    readonly attribute boolean touched;
-    readonly attribute double  value;
+  readonly attribute boolean pressed;
+  readonly attribute boolean touched;
+  readonly attribute double value;
 };
 
 enum GamepadMappingType {
-    "",
-    "standard",
+  "",
+  "standard",
 };
 
 partial interface Navigator {
-    sequence<Gamepad?> getGamepads();
+  sequence<Gamepad?> getGamepads();
 };
 
 [Constructor(GamepadEventInit eventInitDict)]
-interface GamepadEvent : Event {
-    readonly attribute Gamepad gamepad;
+interface GamepadEvent: Event {
+  readonly attribute Gamepad gamepad;
 };
 
-dictionary GamepadEventInit : EventInit {
-    required Gamepad gamepad;
+dictionary GamepadEventInit: EventInit {
+  required Gamepad gamepad;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/payment-request.idl b/tests/wpt/web-platform-tests/interfaces/payment-request.idl
index 50a5dea61f2..f925db202a0 100644
--- a/tests/wpt/web-platform-tests/interfaces/payment-request.idl
+++ b/tests/wpt/web-platform-tests/interfaces/payment-request.idl
@@ -27,8 +27,6 @@ dictionary PaymentMethodData {
 dictionary PaymentCurrencyAmount {
   required DOMString currency;
   required DOMString value;
-  // Note: currencySystem is "at risk" of being removed!
-  DOMString currencySystem = "urn:iso:std:iso:4217";
 };
 
 dictionary PaymentDetailsBase {
diff --git a/tests/wpt/web-platform-tests/interfaces/selection-api.idl b/tests/wpt/web-platform-tests/interfaces/selection-api.idl
index 27efc2acbbf..a06226bd4b8 100644
--- a/tests/wpt/web-platform-tests/interfaces/selection-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/selection-api.idl
@@ -1,36 +1,35 @@
-// http://w3c.github.io/selection-api/#selection-interface
+// GENERATED CONTENT - DO NOT EDIT
+// Content of this file was automatically extracted from the Selection API spec.
+// See https://w3c.github.io/selection-api/
+
 interface Selection {
-  readonly attribute Node?         anchorNode;
+  readonly attribute Node? anchorNode;
   readonly attribute unsigned long anchorOffset;
-  readonly attribute Node?         focusNode;
+  readonly attribute Node? focusNode;
   readonly attribute unsigned long focusOffset;
-  readonly attribute boolean       isCollapsed;
+  readonly attribute boolean isCollapsed;
   readonly attribute unsigned long rangeCount;
-  readonly attribute DOMString     type;
-  Range     getRangeAt(unsigned long index);
-  void      addRange(Range range);
-  void      removeRange(Range range);
-  void      removeAllRanges();
-  void      empty();
-  void      collapse(Node? node, optional unsigned long offset = 0);
-  void      setPosition(Node? node, optional unsigned long offset = 0);
-  void      collapseToStart();
-  void      collapseToEnd();
-  void      extend(Node node, optional unsigned long offset = 0);
-  void      setBaseAndExtent(Node anchorNode,
-                             unsigned long anchorOffset,
-                             Node focusNode,
-                             unsigned long focusOffset);
-  void      selectAllChildren(Node node);
+  readonly attribute DOMString type;
+  Range getRangeAt(unsigned long index);
+  void addRange(Range range);
+  void removeRange(Range range);
+  void removeAllRanges();
+  void empty();
+  void collapse(Node? node, optional unsigned long offset = 0);
+  void setPosition(Node? node, optional unsigned long offset = 0);
+  void collapseToStart();
+  void collapseToEnd();
+  void extend(Node node, optional unsigned long offset = 0);
+  void setBaseAndExtent(Node anchorNode, unsigned long anchorOffset, Node focusNode, unsigned long focusOffset);
+  void selectAllChildren(Node node);
   [CEReactions]
-  void      deleteFromDocument();
-  boolean   containsNode(Node node,
-                         optional boolean allowPartialContainment = false);
+  void deleteFromDocument();
+  boolean containsNode(Node node, optional boolean allowPartialContainment = false);
   stringifier DOMString ();
 };
 
 partial interface Document {
-  Selection? getSelection();
+  Selection ? getSelection();
 };
 
 partial interface Window {
diff --git a/tests/wpt/web-platform-tests/interfaces/vibration.idl b/tests/wpt/web-platform-tests/interfaces/vibration.idl
new file mode 100644
index 00000000000..58b34bb5847
--- /dev/null
+++ b/tests/wpt/web-platform-tests/interfaces/vibration.idl
@@ -0,0 +1,9 @@
+// GENERATED CONTENT - DO NOT EDIT
+// Content of this file was automatically extracted from the Vibration API spec.
+// See https://w3c.github.io/vibration/
+
+typedef (unsigned long or sequence<unsigned long>) VibratePattern;
+
+partial interface Navigator {
+    boolean vibrate (VibratePattern pattern);
+};
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing.https.html
index f6e197cf868..123bbc87c57 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing.https.html
@@ -13,15 +13,18 @@ function crossOriginUrl(path) {
 }
 
 function verify(options) {
-    var url = options.mode === 'cross-origin' ? crossOriginUrl(options.resource)
+    const url = options.mode === 'cross-origin' ? crossOriginUrl(options.resource)
                                       : resourceUrl(options.resource);
-    var entryList = options.performance.getEntriesByName(url);
-    if (entryList.length === 0 && options.allow_no_performance_entry) {
+    const entryList = options.performance.getEntriesByName(url);
+    if (options.should_no_performance_entry) {
         // The performance timeline may not have an entry for a resource
         // which failed to load.
+        assert_equals(entryList.length, 0, options.description);
         return;
     }
-    var entry = entryList[0];
+    assert_equals(entryList.length, 1, options.description);
+    const entry = entryList[0];
+    assert_equals(entry.entryType, 'resource', options.description);
     assert_greater_than(entry.workerStart, 0, options.description);
     assert_greater_than_equal(entry.workerStart, entry.startTime, options.description);
     assert_less_than_equal(entry.workerStart, entry.fetchStart, options.description);
@@ -42,12 +45,12 @@ function verify(options) {
     }
 }
 
-async_test(function(t) {
-    var worker_url = 'resources/resource-timing-worker.js';
-    var scope = 'resources/resource-timing-iframe.sub.html';
-    var registration;
+promise_test(function(t) {
+    const worker_url = 'resources/resource-timing-worker.js';
+    const scope = 'resources/resource-timing-iframe.sub.html';
+    let registration;
 
-    service_worker_unregister_and_register(t, worker_url, scope)
+    return service_worker_unregister_and_register(t, worker_url, scope)
       .then(function(r) {
           registration = r;
           return wait_for_state(t, r.installing, 'activated');
@@ -56,7 +59,7 @@ async_test(function(t) {
           return with_iframe(scope);
         })
       .then(function(frame) {
-          var performance = frame.contentWindow.performance;
+          const performance = frame.contentWindow.performance;
           verify({
               performance: performance,
               resource: 'resources/dummy.js',
@@ -96,28 +99,45 @@ async_test(function(t) {
               resource: 'resources/missing.jpg',
               mode: 'same-origin',
               description: 'Network fallback load failure',
-              allow_no_performance_entry: true,
+              should_no_performance_entry: true,
           });
           verify({
               performance: performance,
               resource: 'resources/missing.jpg',
               mode: 'cross-origin',
               description: 'Network fallback cross-origin load failure',
-              allow_no_performance_entry: true,
+              should_no_performance_entry: true,
+          });
+          // Tests for respondWith(fetch()).
+          verify({
+              performance: performance,
+              resource: 'resources/missing.jpg?SWRespondsWithFetch',
+              mode: 'same-origin',
+              description: 'Resource in iframe, nonexistent but responded with fetch to another.',
+          });
+          verify({
+              performance: performance,
+              resource: 'resources/dummy.txt?SWFetched',
+              mode: 'same-origin',
+              description: 'Resource fetched as response from missing.jpg?SWRespondsWithFetch.',
+              should_no_performance_entry: true,
+          });
+          // Test for a normal resource that is unaffected by the Service Worker.
+          verify({
+              performance: performance,
+              resource: 'resources/empty-worker.js',
+              mode: 'same-origin',
+              description: 'Resource untouched by the Service Worker.',
           });
 
           frame.remove();
           return registration.unregister();
-        })
-      .then(function() {
-          t.done();
-        })
-      .catch(unreached_rejection(t));
+      });
 }, 'Controlled resource loads');
 
-test(function() {
-    var url = resourceUrl('resources/test-helpers.sub.js');
-    var entry = window.performance.getEntriesByName(url)[0];
+test(() => {
+    const url = resourceUrl('resources/test-helpers.sub.js');
+    const entry = window.performance.getEntriesByName(url)[0];
     assert_equals(entry.workerStart, 0, 'Non-controlled');
 }, 'Non-controlled resource loads');
 
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 69cff7c00af..4b626576ab4 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
@@ -6,3 +6,5 @@
 <img src="https://{{domains[www1]}}:{{ports[https][0]}}/service-workers/service-worker/resources/square.png">
 <img src="missing.jpg">
 <img src="https://{{domains[www1]}}:{{ports[https][0]}}/service-workers/service-worker/resources/missing.jpg">
+<img src='missing.jpg?SWRespondsWithFetch'>
+<script src='empty-worker.js'></script>
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 8b30467227d..5bc6ef34748 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
@@ -6,4 +6,7 @@ self.addEventListener('fetch', function(event) {
       setTimeout(_ => resolve(new Response('// Empty javascript')), 50);
     }));
   }
+  else if (event.request.url.indexOf('missing.jpg?SWRespondsWithFetch') != -1) {
+    event.respondWith(fetch('dummy.txt?SWFetched'));
+  }
 });
diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/general.js b/tests/wpt/web-platform-tests/streams/writable-streams/general.js
index 7187572f78f..1fd041b5467 100644
--- a/tests/wpt/web-platform-tests/streams/writable-streams/general.js
+++ b/tests/wpt/web-platform-tests/streams/writable-streams/general.js
@@ -111,56 +111,54 @@ promise_test(() => {
   );
 }, 'closed and ready on a released writer');
 
-promise_test(() => {
-  const promises = {};
-  const resolvers = {};
-  for (const methodName of ['start', 'write', 'close', 'abort']) {
-    promises[methodName] = new Promise(resolve => {
-      resolvers[methodName] = resolve;
-    });
-  }
-
+promise_test(t => {
+  let thisObject = null;
   // Calls to Sink methods after the first are implicitly ignored. Only the first value that is passed to the resolver
   // is used.
   class Sink {
     start() {
       // Called twice
-      resolvers.start(this);
+      t.step(() => {
+        assert_equals(this, thisObject, 'start should be called as a method');
+      });
     }
 
     write() {
-      resolvers.write(this);
+      t.step(() => {
+        assert_equals(this, thisObject, 'write should be called as a method');
+      });
     }
 
     close() {
-      resolvers.close(this);
+      t.step(() => {
+        assert_equals(this, thisObject, 'close should be called as a method');
+      });
     }
 
     abort() {
-      resolvers.abort(this);
+      t.step(() => {
+        assert_equals(this, thisObject, 'abort should be called as a method');
+      });
     }
   }
 
   const theSink = new Sink();
+  thisObject = theSink;
   const ws = new WritableStream(theSink);
 
   const writer = ws.getWriter();
 
   writer.write('a');
-  writer.close();
+  const closePromise = writer.close();
 
   const ws2 = new WritableStream(theSink);
   const writer2 = ws2.getWriter();
-  writer2.abort();
+  const abortPromise = writer2.abort();
 
-  return promises.start
-      .then(thisValue => assert_equals(thisValue, theSink, 'start should be called as a method'))
-      .then(() => promises.write)
-      .then(thisValue => assert_equals(thisValue, theSink, 'write should be called as a method'))
-      .then(() => promises.close)
-      .then(thisValue => assert_equals(thisValue, theSink, 'close should be called as a method'))
-      .then(() => promises.abort)
-      .then(thisValue => assert_equals(thisValue, theSink, 'abort should be called as a method'));
+  return Promise.all([
+    closePromise,
+    abortPromise
+  ]);
 }, 'WritableStream should call underlying sink methods as methods');
 
 promise_test(t => {
diff --git a/tests/wpt/web-platform-tests/streams/writable-streams/start.js b/tests/wpt/web-platform-tests/streams/writable-streams/start.js
index 0122799b669..52bcb283171 100644
--- a/tests/wpt/web-platform-tests/streams/writable-streams/start.js
+++ b/tests/wpt/web-platform-tests/streams/writable-streams/start.js
@@ -154,7 +154,7 @@ promise_test(t => {
     start() {
       return Promise.reject();
     }
-  }, new CountQueuingStrategy({ highWaterMark: 0 }));
+  }, { highWaterMark: 0 });
   const writer = ws.getWriter();
   catchAndRecord(writer.ready, 'ready');
   catchAndRecord(writer.closed, 'closed');
diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect-expected.html b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect-expected.html
rename to tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect-ref.html
diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect.html b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect.html
index 928a136c95e..5757d07a099 100644
--- a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect.html
+++ b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect.html
@@ -1,5 +1,5 @@
 <!doctype HTML>
-<link rel="match" href="foreign-object-paints-before-rect-expected.html">
+<link rel="match" href="foreign-object-paints-before-rect-ref.html">
 <link rel="help" href="https://svgwg.org/svg2-draft/single-page.html#embedded-ForeignObjectElement"/>
 <style>
 * {
diff --git a/tests/wpt/web-platform-tests/url/README.md b/tests/wpt/web-platform-tests/url/README.md
index cc63177a842..4452a6a827a 100644
--- a/tests/wpt/web-platform-tests/url/README.md
+++ b/tests/wpt/web-platform-tests/url/README.md
@@ -1,3 +1,5 @@
+## urltestdata.json
+
 These tests are for browsers, but the data for
 `a-element.html`, `url-constructor.html`, `a-element-xhtml.xhtml`, and `failure.html`
 is in `urltestdata.json` and can be re-used by non-browser implementations.
@@ -25,5 +27,10 @@ true, parsing `about:blank` against `base` must give failure. This tests that th
 converting base URLs into strings properly fails the whole parsing algorithm if the base URL cannot
 be parsed.
 
+## URL parser's encoding argument
+
+Tests in `/encoding` and `/html/infrastructure/urls/resolving-urls/query-encoding/` cover the
+encoding argument to the URL parser.
+
 [parsing]: https://url.spec.whatwg.org/#concept-basic-url-parser
 [API]: https://url.spec.whatwg.org/#api
diff --git a/tests/wpt/web-platform-tests/xhr/open-url-encoding.htm b/tests/wpt/web-platform-tests/xhr/open-url-encoding.htm
index ddf8018159c..5155a57d65a 100644
--- a/tests/wpt/web-platform-tests/xhr/open-url-encoding.htm
+++ b/tests/wpt/web-platform-tests/xhr/open-url-encoding.htm
@@ -5,7 +5,6 @@
     <title>XMLHttpRequest: open() - URL encoding</title>
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <link rel="help" href="https://xhr.spec.whatwg.org/#the-open()-method" data-tested-assertations="following::ol/li[7] following::ol/li[14]/ul/li[2]" />
   </head>
   <body>
     <div id="log"></div>
@@ -20,7 +19,7 @@
         var client = new XMLHttpRequest()
         client.open("GET", "resources/content.py?\uD83D", false)
         client.send()
-        assert_equals(client.getResponseHeader("x-request-query"), "&%2365533;")
+        assert_equals(client.getResponseHeader("x-request-query"), "%26%2365533%3B");
       }, "lone surrogate");
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/xhr/resources/accept-language.py b/tests/wpt/web-platform-tests/xhr/resources/accept-language.py
index e0fd30c1195..dd00f4b2ee7 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/accept-language.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/accept-language.py
@@ -1,4 +1,3 @@
 def main(request, response):
     return [("Content-Type", "text/plain"),
             request.headers.get("Accept-Language", "NO")]
-
diff --git a/tests/wpt/web-platform-tests/xhr/resources/accept.py b/tests/wpt/web-platform-tests/xhr/resources/accept.py
index 2fdf210b6d6..a033ebec646 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/accept.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/accept.py
@@ -1,3 +1,2 @@
 def main(request, response):
-  return [("Content-Type", "text/plain")], request.headers.get("accept", "NO")
-
+    return [("Content-Type", "text/plain")], request.headers.get("accept", "NO")
diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-allow-with-body.py b/tests/wpt/web-platform-tests/xhr/resources/access-control-allow-with-body.py
index 22134356735..7c7f45c6901 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/access-control-allow-with-body.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/access-control-allow-with-body.py
@@ -1,12 +1,12 @@
 def main(request, response):
     headers = {
-            "Cache-Control": "no-store",
-            "Access-Control-Allow-Headers": "X-Requested-With",
-            "Access-Control-Max-Age": 0,
-            "Access-Control-Allow-Origin": "*",
-            "Access-Control-Allow-Methods": "*",
-            "Vary": "Accept-Encoding",
-            "Content-Type": "text/plain"
+        "Cache-Control": "no-store",
+        "Access-Control-Allow-Headers": "X-Requested-With",
+        "Access-Control-Max-Age": 0,
+        "Access-Control-Allow-Origin": "*",
+        "Access-Control-Allow-Methods": "*",
+        "Vary": "Accept-Encoding",
+        "Content-Type": "text/plain"
     }
 
     for (name, value) in headers.items():
diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-basic-whitelist-response-headers.py b/tests/wpt/web-platform-tests/xhr/resources/access-control-basic-whitelist-response-headers.py
index e7c15bb8b30..4dac7533197 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/access-control-basic-whitelist-response-headers.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/access-control-basic-whitelist-response-headers.py
@@ -1,17 +1,17 @@
 def main(request, response):
     headers = {
-            # CORS-safelisted
-            "content-type": "text/plain",
-            "cache-control": "no cache",
-            "content-language": "en",
-            "expires": "Fri, 30 Oct 1998 14:19:41 GMT",
-            "last-modified": "Tue, 15 Nov 1994 12:45:26 GMT",
-            "pragma": "no-cache",
+        # CORS-safelisted
+        "content-type": "text/plain",
+        "cache-control": "no cache",
+        "content-language": "en",
+        "expires": "Fri, 30 Oct 1998 14:19:41 GMT",
+        "last-modified": "Tue, 15 Nov 1994 12:45:26 GMT",
+        "pragma": "no-cache",
 
-            # Non-CORS-safelisted
-            "x-test": "foobar",
+        # Non-CORS-safelisted
+        "x-test": "foobar",
 
-            "Access-Control-Allow-Origin": "*"
+        "Access-Control-Allow-Origin": "*"
     }
     for header in headers:
         response.headers.set(header, headers[header])
diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-origin-header.py b/tests/wpt/web-platform-tests/xhr/resources/access-control-origin-header.py
index e7b95e95fd4..f5128776d2b 100755
--- a/tests/wpt/web-platform-tests/xhr/resources/access-control-origin-header.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/access-control-origin-header.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 def main(request, response):
-    response.headers.set("Content-Type", "text/plain");
-    response.headers.set("Cache-Control", "no-cache, no-store");
-    response.headers.set("Access-Control-Allow-External", "true");
-    response.headers.set("Access-Control-Allow-Origin", "*");
+    response.headers.set("Content-Type", "text/plain")
+    response.headers.set("Cache-Control", "no-cache, no-store")
+    response.headers.set("Access-Control-Allow-External", "true")
+    response.headers.set("Access-Control-Allow-Origin", "*")
 
     response.content = "PASS: Cross-domain access allowed.\n"
-    response.content += "HTTP_ORIGIN: " + request.headers.get("origin");
+    response.content += "HTTP_ORIGIN: " + request.headers.get("origin")
diff --git a/tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-denied.py b/tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-denied.py
index fd221a6248b..889ee6b0eca 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-denied.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/access-control-preflight-denied.py
@@ -47,4 +47,3 @@ def main(request, response):
     else:
         resetState(token)
         fail("Unknown Error.")
-
diff --git a/tests/wpt/web-platform-tests/xhr/resources/auth2/corsenabled.py b/tests/wpt/web-platform-tests/xhr/resources/auth2/corsenabled.py
index 77b4acfe24a..b06bd3d9aac 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/auth2/corsenabled.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/auth2/corsenabled.py
@@ -5,11 +5,11 @@ here = os.path.dirname(__file__)
 
 
 def main(request, response):
-    response.headers.set('Access-Control-Allow-Origin', request.headers.get("origin"));
-    response.headers.set('Access-Control-Allow-Credentials', 'true');
-    response.headers.set('Access-Control-Allow-Methods', 'GET');
-    response.headers.set('Access-Control-Allow-Headers', 'authorization, x-user, x-pass');
-    response.headers.set('Access-Control-Expose-Headers', 'x-challenge, xhr-user, ses-user');
+    response.headers.set('Access-Control-Allow-Origin', request.headers.get("origin"))
+    response.headers.set('Access-Control-Allow-Credentials', 'true')
+    response.headers.set('Access-Control-Allow-Methods', 'GET')
+    response.headers.set('Access-Control-Allow-Headers', 'authorization, x-user, x-pass')
+    response.headers.set('Access-Control-Expose-Headers', 'x-challenge, xhr-user, ses-user')
     auth = imp.load_source("", os.path.abspath(os.path.join(here, os.pardir, "authentication.py")))
     if request.method == "OPTIONS":
         return ""
diff --git a/tests/wpt/web-platform-tests/xhr/resources/auth7/corsenabled.py b/tests/wpt/web-platform-tests/xhr/resources/auth7/corsenabled.py
index b183b325e36..998922d0760 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/auth7/corsenabled.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/auth7/corsenabled.py
@@ -4,11 +4,11 @@ import os
 here = os.path.dirname(__file__)
 
 def main(request, response):
-    response.headers.set('Access-Control-Allow-Origin', request.headers.get("origin"));
-    response.headers.set('Access-Control-Allow-Credentials', 'true');
-    response.headers.set('Access-Control-Allow-Methods', 'GET');
-    response.headers.set('Access-Control-Allow-Headers', 'authorization, x-user, x-pass');
-    response.headers.set('Access-Control-Expose-Headers', 'x-challenge, xhr-user, ses-user');
+    response.headers.set('Access-Control-Allow-Origin', request.headers.get("origin"))
+    response.headers.set('Access-Control-Allow-Credentials', 'true')
+    response.headers.set('Access-Control-Allow-Methods', 'GET')
+    response.headers.set('Access-Control-Allow-Headers', 'authorization, x-user, x-pass')
+    response.headers.set('Access-Control-Expose-Headers', 'x-challenge, xhr-user, ses-user')
     auth = imp.load_source("", os.path.join(here,
                                             os.pardir,
                                             "authentication.py"))
@@ -16,6 +16,3 @@ def main(request, response):
         return ""
     else:
         return auth.main(request, response)
-
-
-
diff --git a/tests/wpt/web-platform-tests/xhr/resources/auth8/corsenabled-no-authorize.py b/tests/wpt/web-platform-tests/xhr/resources/auth8/corsenabled-no-authorize.py
index 623a37430da..947422fbfc5 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/auth8/corsenabled-no-authorize.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/auth8/corsenabled-no-authorize.py
@@ -5,11 +5,11 @@ here = os.path.dirname(__file__)
 
 
 def main(request, response):
-    response.headers.set('Access-Control-Allow-Origin', request.headers.get("origin"));
-    response.headers.set('Access-Control-Allow-Credentials', 'true');
-    response.headers.set('Access-Control-Allow-Methods', 'GET');
-    response.headers.set('Access-Control-Allow-Headers', 'x-user, x-pass');
-    response.headers.set('Access-Control-Expose-Headers', 'x-challenge, xhr-user, ses-user');
+    response.headers.set('Access-Control-Allow-Origin', request.headers.get("origin"))
+    response.headers.set('Access-Control-Allow-Credentials', 'true')
+    response.headers.set('Access-Control-Allow-Methods', 'GET')
+    response.headers.set('Access-Control-Allow-Headers', 'x-user, x-pass')
+    response.headers.set('Access-Control-Expose-Headers', 'x-challenge, xhr-user, ses-user')
     auth = imp.load_source("", os.path.join(here,
                                             os.pardir,
                                             "authentication.py"))
@@ -17,6 +17,3 @@ def main(request, response):
         return ""
     else:
         return auth.main(request, response)
-
-
-
diff --git a/tests/wpt/web-platform-tests/xhr/resources/authentication.py b/tests/wpt/web-platform-tests/xhr/resources/authentication.py
index 369a49ad22b..f5bef5ba826 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/authentication.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/authentication.py
@@ -23,5 +23,4 @@ def main(request, response):
         headers = [('XHR-USER', expected_user_name),
                    ('SES-USER', session_user),
                    ("X-challenge", challenge)]
-        return headers, session_user + "\n" + session_pass;
-
+        return headers, session_user + "\n" + session_pass
diff --git a/tests/wpt/web-platform-tests/xhr/resources/chunked.py b/tests/wpt/web-platform-tests/xhr/resources/chunked.py
index 7e8433bd869..1e87c1ca561 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/chunked.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/chunked.py
@@ -4,9 +4,9 @@ def main(request, response):
               "Yet another (third) chunk\r\n",
               "Yet another (fourth) chunk\r\n",
               ]
-    response.headers.set("Transfer-Encoding", "chunked");
-    response.headers.set("Trailer", "X-Test-Me");
-    response.headers.set("Content-Type", "text/plain");
+    response.headers.set("Transfer-Encoding", "chunked")
+    response.headers.set("Trailer", "X-Test-Me")
+    response.headers.set("Content-Type", "text/plain")
     response.write_status_headers()
 
     for value in chunks:
@@ -15,4 +15,3 @@ def main(request, response):
         response.writer.write("\r\n")
     response.writer.write("0\r\n")
     response.writer.write("X-Test-Me: Trailer header value\r\n\r\n")
-
diff --git a/tests/wpt/web-platform-tests/xhr/resources/conditional.py b/tests/wpt/web-platform-tests/xhr/resources/conditional.py
index 90bedf99529..5a11a31a4d6 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/conditional.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/conditional.py
@@ -19,7 +19,7 @@ def main(request, response):
         response.headers.set("Access-Control-Allow-Origin", "*")
 
     if ((match is not None and match == tag) or
-        (modified is not None and modified == date)):
+            (modified is not None and modified == date)):
         response.status = (304, "SUPERCOOL")
         return ""
     else:
diff --git a/tests/wpt/web-platform-tests/xhr/resources/content.py b/tests/wpt/web-platform-tests/xhr/resources/content.py
index d7c62ab6d86..3786f3aa075 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/content.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/content.py
@@ -2,7 +2,7 @@ def main(request, response):
     response_ctype = ''
 
     if "response_charset_label" in request.GET:
-      response_ctype = ";charset=" + request.GET.first("response_charset_label")
+        response_ctype = ";charset=" + request.GET.first("response_charset_label")
 
     headers = [("Content-type", "text/plain" + response_ctype),
                ("X-Request-Method", request.method),
diff --git a/tests/wpt/web-platform-tests/xhr/resources/delay.py b/tests/wpt/web-platform-tests/xhr/resources/delay.py
index 0fa1276f878..8f97db6f4fc 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/delay.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/delay.py
@@ -2,6 +2,6 @@ import time
 
 def main(request, response):
     delay = float(request.GET.first("ms", 500))
-    time.sleep(delay / 1E3);
+    time.sleep(delay / 1E3)
 
     return [("Access-Control-Allow-Origin", "*"), ("Access-Control-Allow-Methods", "YO"), ("Content-type", "text/plain")], "TEST_DELAY"
diff --git a/tests/wpt/web-platform-tests/xhr/resources/gzip.py b/tests/wpt/web-platform-tests/xhr/resources/gzip.py
index 87dd5bec097..f17f92e4cc1 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/gzip.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/gzip.py
@@ -9,7 +9,7 @@ def main(request, response):
 
     out = StringIO()
     with gzip_module.GzipFile(fileobj=out, mode="w") as f:
-      f.write(output)
+        f.write(output)
     output = out.getvalue()
 
     headers = [("Content-type", "text/plain"),
diff --git a/tests/wpt/web-platform-tests/xhr/resources/headers.py b/tests/wpt/web-platform-tests/xhr/resources/headers.py
index cefa8ee65f7..602db35a3cb 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/headers.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/headers.py
@@ -1,4 +1,4 @@
- # -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 
 def main(request, response):
     response.headers.set("Content-Type", "text/plain")
diff --git a/tests/wpt/web-platform-tests/xhr/resources/infinite-redirects.py b/tests/wpt/web-platform-tests/xhr/resources/infinite-redirects.py
index 1ec0ae27dcf..a85c410218e 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/infinite-redirects.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/infinite-redirects.py
@@ -2,9 +2,9 @@ def main(request, response):
     location = "%s://%s%s" % (request.url_parts.scheme,
                               request.url_parts.netloc,
                               request.url_parts.path)
-    page = "alternate";
-    type = 302;
-    mix = 0;
+    page = "alternate"
+    type = 302
+    mix = 0
     if request.GET.first("page", None) == "alternate":
         page = "default"
 
diff --git a/tests/wpt/web-platform-tests/xhr/resources/inspect-headers.py b/tests/wpt/web-platform-tests/xhr/resources/inspect-headers.py
index a8f1258fa25..12dd33595f0 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/inspect-headers.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/inspect-headers.py
@@ -15,7 +15,7 @@ def get_response(raw_headers, filter_value, filter_name):
             if value == filter_value:
                 result += name + ","
         elif name.lower() == filter_name:
-            result += name + ": " + value + "\n";
+            result += name + ": " + value + "\n"
     return result
 
 def main(request, response):
diff --git a/tests/wpt/web-platform-tests/xhr/resources/redirect.py b/tests/wpt/web-platform-tests/xhr/resources/redirect.py
index 3e0cd529a51..2af9f2ee8a9 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/redirect.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/redirect.py
@@ -2,11 +2,11 @@ import time
 
 def main(request, response):
     code = int(request.GET.first("code", 302))
-    location = request.GET.first("location", request.url_parts.path +"?followed")
+    location = request.GET.first("location", request.url_parts.path + "?followed")
 
     if "delay" in request.GET:
         delay = float(request.GET.first("delay"))
-        time.sleep(delay / 1E3);
+        time.sleep(delay / 1E3)
 
     if "followed" in request.GET:
         return [("Content:Type", "text/plain")], "MAGIC HAPPENED"
diff --git a/tests/wpt/web-platform-tests/xhr/resources/requri.py b/tests/wpt/web-platform-tests/xhr/resources/requri.py
index eaa562dff24..a3f7bfda351 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/requri.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/requri.py
@@ -3,4 +3,3 @@ def main(request, response):
         return request.url
     else:
         return request.request_path
-
diff --git a/tests/wpt/web-platform-tests/xhr/resources/shift-jis-html.py b/tests/wpt/web-platform-tests/xhr/resources/shift-jis-html.py
index 92d06ca78c4..fab78c0b3ac 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/shift-jis-html.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/shift-jis-html.py
@@ -1,6 +1,6 @@
 def main(request, response):
     headers = [("Content-type", "text/html;charset=shift-jis")]
     # Shift-JIS bytes for katakana TE SU TO ('test')
-    content =  chr(0x83) + chr(0x65) + chr(0x83) + chr(0x58) + chr(0x83) + chr(0x67);
+    content = chr(0x83) + chr(0x65) + chr(0x83) + chr(0x58) + chr(0x83) + chr(0x67)
 
     return headers, content
diff --git a/tests/wpt/web-platform-tests/xhr/resources/trickle.py b/tests/wpt/web-platform-tests/xhr/resources/trickle.py
index 5a46c5e82e6..418e2459921 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/trickle.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/trickle.py
@@ -9,7 +9,7 @@ def main(request, response):
     time.sleep(delay)
     response.headers.set("Content-type", "text/plain")
     response.write_status_headers()
-    time.sleep(delay);
+    time.sleep(delay)
     for i in xrange(count):
         response.writer.write_content(chunk)
         time.sleep(delay)
diff --git a/tests/wpt/web-platform-tests/xhr/resources/upload.py b/tests/wpt/web-platform-tests/xhr/resources/upload.py
index 27cee598b71..304bea9e5ef 100644
--- a/tests/wpt/web-platform-tests/xhr/resources/upload.py
+++ b/tests/wpt/web-platform-tests/xhr/resources/upload.py
@@ -2,7 +2,7 @@ def main(request, response):
     content = []
 
     for key, values in sorted(item for item in request.POST.items() if not hasattr(item[1][0], "filename")):
-         content.append("%s=%s," % (key, values[0]))
+        content.append("%s=%s," % (key, values[0]))
     content.append("\n")
 
     for key, values in sorted(item for item in request.POST.items() if hasattr(item[1][0], "filename")):