diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 0a87afe0b01..f62d6f1bec8 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -16238,8 +16238,15 @@
      }
     },
     "user-activation": {
-     "activation-hierarchy-parent-manual.sub.tentative.html": [
-      "7dd8018573db2808b7166cf7e94650a2a5a330bc",
+     "activation-hierarchy-crossorigin-parent-manual.sub.html": [
+      "601b9003f7ea9ba9847366a9365a08139f810078",
+      [
+       null,
+       {}
+      ]
+     ],
+     "activation-hierarchy-sameorigin-parent-manual.html": [
+      "a7f423eea56f0e6dd41ecf9a950137ef502fdf12",
       [
        null,
        {}
@@ -136774,32 +136781,6 @@
        {}
       ]
      ],
-     "ttwf-reftest-flex-wrap-reverse.html": [
-      "f2aefa29e8b5e4461e6a8ae9eb76bc8c1c771698",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/reference/ttwf-reftest-flex-wrap-reverse-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "ttwf-reftest-flex-wrap.html": [
-      "3acd79c46500a81219edbc57fc8f434d22342a8d",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/reference/ttwf-reftest-flex-wrap-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "whitespace-in-flexitem-001.html": [
       "bec931a4e331192704701d261807e9b0ce7d3c6b",
       [
@@ -240355,7 +240336,7 @@
       []
      ],
      "echo-ua-client-hints-received.py": [
-      "9cf1f8e32ffe3e1079a9ae48303ff314210aa145",
+      "4af98c75ccedebe10aa02f17881099e95af1527f",
       []
      ],
      "expect-client-hints-headers-iframe.py": [
@@ -283578,14 +283559,6 @@
       "ttwf-reftest-flex-inline-ref.html": [
        "369de990ff2190ea0e4592d4dfc354a8a8fcae16",
        []
-      ],
-      "ttwf-reftest-flex-wrap-ref.html": [
-       "bb3e2b947af42106dec6974664075afb9e8cb7d3",
-       []
-      ],
-      "ttwf-reftest-flex-wrap-reverse-ref.html": [
-       "fe6e510ccab62b7121e95bbb3675f7940d7510c9",
-       []
       ]
      },
      "scrollbars-auto-ref.html": [
@@ -315812,7 +315785,7 @@
        []
       ],
       "report.py": [
-       "17ca65cbf6b3f384dabff5a479eb22730d3de511",
+       "1f628ca878d6bcaf8f32e2c6ed524e6f0eeda4ca",
        []
       ],
       "reporting-empty-frame.html": [
@@ -323735,14 +323708,22 @@
     },
     "user-activation": {
      "resources": {
-      "activation-hierarchy-child.sub.html": [
-       "ebccc8c0dbf9da8a95049712f0fdd641b66b629b",
+      "activation-hierarchy-crossorigin-child.sub.html": [
+       "6dbd46830442d5790207e1309bf4403a353c9c62",
        []
       ],
-      "activation-hierarchy-grandchild.html": [
+      "activation-hierarchy-crossorigin-grandchild.html": [
        "b9fe19a746ffbbe63740df67a77da8a894b573ae",
        []
       ],
+      "activation-hierarchy-sameorigin-child.html": [
+       "d54c7efc9bdcf2cc5c79fed6838729975bee4cfa",
+       []
+      ],
+      "activation-hierarchy-sameorigin-grandchild.html": [
+       "9d664e2356a87496416644d639598adbaa8c43dd",
+       []
+      ],
       "child-four.html": [
        "65d17f273e1868312f59c89f3f2d05bda759ae1a",
        []
@@ -324475,90 +324456,6 @@
      "3803e350c844b4af77b871831817ac0d90aca97f",
      []
     ],
-    "builtin-support.tentative": {
-     "@std": {
-      "__dir__.headers": [
-       "e7ec0d6699d07e5b13d0cb6f24c3639258fccdaa",
-       []
-      ],
-      "blank": [
-       "38e1891bf7d5db9ad7063dc1f22bb17f8b1d4446",
-       []
-      ],
-      "none": [
-       "69e165cce5e223684c9d0f0f7848bc6fc02b14cd",
-       []
-      ]
-     },
-     "bare": {
-      "__dir__.headers": [
-       "e7ec0d6699d07e5b13d0cb6f24c3639258fccdaa",
-       []
-      ],
-      "blank": [
-       "841d433acf72f828c34faca23f26e9afd10fbab7",
-       []
-      ],
-      "none": [
-       "2aec0d72826f203074dea5a5268b9f937bdb7183",
-       []
-      ],
-      "std-blank": [
-       "5ded98fd382a52a11d52af57cc7e79f56b083843",
-       []
-      ],
-      "std-none": [
-       "1437d9ff1e0c0c60672a1f656a2ab91aa01601db",
-       []
-      ]
-     },
-     "imported": {
-      "resources": {
-       "helpers": {
-        "parsing.js": [
-         "3000f782a11a197b37e3fc7658190fc67ffd4050",
-         []
-        ]
-       },
-       "parsing-addresses.js": [
-        "0f5fc73506b1222dd7b3ac422d8c6232ac202bd7",
-        []
-       ],
-       "parsing-schema.js": [
-        "72b6e625d611d1551ff4fc9a2ead389b309fbafa",
-        []
-       ],
-       "parsing-scope-keys.js": [
-        "4993f3a9a8bac441b883be55b58d40423114beab",
-        []
-       ],
-       "parsing-specifier-keys.js": [
-        "9eb423a19eb1fb417526946c1701c7c9dde27c9c",
-        []
-       ],
-       "resolving-builtins.js": [
-        "a9383df843d44794351d5c6ffa5580d4d1254b9c",
-        []
-       ],
-       "resolving-not-yet-implemented.js": [
-        "93d782fdad83d58160061a4caa40659292a50866",
-        []
-       ],
-       "resolving-scopes.js": [
-        "ca19a66840601efe66fa2db24cffdcc0727681c5",
-        []
-       ],
-       "resolving.js": [
-        "29ee31ccbc936787894a43de1f6625608d14a192",
-        []
-       ]
-      }
-     },
-     "static-import.py": [
-      "8d0f5d9f4204384ec9612ddca3ec30cec017d14e",
-      []
-     ]
-    },
     "common": {
      "README.md": [
       "6092c0d767050d0c1b13cfd2360f7a7f17d656a5",
@@ -324690,10 +324587,6 @@
       "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
       []
      ],
-     "jest-test-helper.js": [
-      "752c987df52036d1d54985bf1a9f4b27ce20c2d4",
-      []
-     ],
      "log.js": [
       "a024a29bf2482c78cf7eb96544d38217f1d81f81",
       []
@@ -327685,22 +327578,6 @@
         ]
        },
        "sharedworker-classic": {
-        "cross-http.keep-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
-        "cross-http.no-redirect.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
-        "cross-http.swap-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
-        "cross-https.swap-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
         "same-http.keep-scheme.https.html.headers": [
          "46e2255e388e9e08377d625b55653a007d59c14e",
          []
@@ -327709,10 +327586,6 @@
          "46e2255e388e9e08377d625b55653a007d59c14e",
          []
         ],
-        "same-http.swap-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
         "same-https.keep-scheme.https.html.headers": [
          "46e2255e388e9e08377d625b55653a007d59c14e",
          []
@@ -327720,10 +327593,6 @@
         "same-https.no-redirect.https.html.headers": [
          "46e2255e388e9e08377d625b55653a007d59c14e",
          []
-        ],
-        "same-https.swap-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
         ]
        },
        "sharedworker-import-data": {
@@ -327769,22 +327638,6 @@
         ]
        },
        "sharedworker-module": {
-        "cross-http.keep-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
-        "cross-http.no-redirect.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
-        "cross-http.swap-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
-        "cross-https.swap-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
         "same-http.keep-scheme.https.html.headers": [
          "46e2255e388e9e08377d625b55653a007d59c14e",
          []
@@ -327793,10 +327646,6 @@
          "46e2255e388e9e08377d625b55653a007d59c14e",
          []
         ],
-        "same-http.swap-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
         "same-https.keep-scheme.https.html.headers": [
          "46e2255e388e9e08377d625b55653a007d59c14e",
          []
@@ -327804,10 +327653,6 @@
         "same-https.no-redirect.https.html.headers": [
          "46e2255e388e9e08377d625b55653a007d59c14e",
          []
-        ],
-        "same-https.swap-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
         ]
        },
        "video-tag": {
@@ -327867,22 +327712,6 @@
         ]
        },
        "worker-classic": {
-        "cross-http.keep-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
-        "cross-http.no-redirect.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
-        "cross-http.swap-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
-        "cross-https.swap-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
         "same-http.keep-scheme.https.html.headers": [
          "46e2255e388e9e08377d625b55653a007d59c14e",
          []
@@ -327891,10 +327720,6 @@
          "46e2255e388e9e08377d625b55653a007d59c14e",
          []
         ],
-        "same-http.swap-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
         "same-https.keep-scheme.https.html.headers": [
          "46e2255e388e9e08377d625b55653a007d59c14e",
          []
@@ -327902,10 +327727,6 @@
         "same-https.no-redirect.https.html.headers": [
          "46e2255e388e9e08377d625b55653a007d59c14e",
          []
-        ],
-        "same-https.swap-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
         ]
        },
        "worker-import-data": {
@@ -327951,22 +327772,6 @@
         ]
        },
        "worker-module": {
-        "cross-http.keep-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
-        "cross-http.no-redirect.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
-        "cross-http.swap-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
-        "cross-https.swap-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
         "same-http.keep-scheme.https.html.headers": [
          "46e2255e388e9e08377d625b55653a007d59c14e",
          []
@@ -327975,10 +327780,6 @@
          "46e2255e388e9e08377d625b55653a007d59c14e",
          []
         ],
-        "same-http.swap-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
-        ],
         "same-https.keep-scheme.https.html.headers": [
          "46e2255e388e9e08377d625b55653a007d59c14e",
          []
@@ -327986,10 +327787,6 @@
         "same-https.no-redirect.https.html.headers": [
          "46e2255e388e9e08377d625b55653a007d59c14e",
          []
-        ],
-        "same-https.swap-scheme.https.html.headers": [
-         "46e2255e388e9e08377d625b55653a007d59c14e",
-         []
         ]
        },
        "worklet-animation": {
@@ -338608,7 +338405,7 @@
      ]
     },
     "testcommon.js": [
-     "ca2596885669f24b5f170cf1b023cd3c3cc34b93",
+     "ab22ff64835e8c12fe0f2432060b79c44881bb5f",
      []
     ]
    },
@@ -343212,7 +343009,7 @@
      []
     ],
     "requirements_mypy.txt": [
-     "a478015893d71a45953f9651844a35c2a46ba7d2",
+     "988ffe848174f7215278c2c4019f924bed3a61f5",
      []
     ],
     "runner": {
@@ -348053,7 +347850,7 @@
       []
      ],
      "requirements_firefox.txt": [
-      "ae72940810432bed693c001d4b057a1214fd2dac",
+      "d541a49f3c0992c4a456ce4ebb717908683a464e",
       []
      ],
      "requirements_ie.txt": [
@@ -350132,7 +349929,7 @@
      ]
     },
     "testcommon.js": [
-     "f89cbbaf9361b1e50b1473e93ae63aaa1abb34c7",
+     "811fe784c2635546c8bd1d6befc276d1cfbfad9a",
      []
     ],
     "timing-model": {
@@ -351271,7 +351068,7 @@
       ]
      },
      "version.js": [
-      "f8067d48eeb9a9942cd2797c57fbaa471044671f",
+      "0b58dd9b3c4430d337b4a6241f2345f4073a12b9",
       []
      ]
     },
@@ -351325,6 +351122,10 @@
         []
        ]
       },
+      "capability_info.js": [
+       "10947ee1367e1d943e52a605fe868a06376badbe",
+       []
+      ],
       "command_buffer": {
        "basic.spec.js": [
         "6762a563c56edafeb225df6af27bd4507825e56f",
@@ -351332,7 +351133,7 @@
        ],
        "compute": {
         "basic.spec.js": [
-         "598edea66ab3946b45548ca3cea1d8becd8aec55",
+         "536f7a9003eded24dced4ebc206c78472b26acb0",
          []
         ]
        },
@@ -351346,17 +351147,17 @@
          []
         ],
         "rendering.spec.js": [
-         "7bb7c546b5842aa585dec89ec456ad78a4ccfc18",
+         "b26b9fbc859d5b2a5fbf79e9e1ca3f76cb02e455",
          []
         ],
         "storeop.spec.js": [
-         "5bf6bd0116c80eea3082fab2f84522027755672b",
+         "1f758cc5c2ea74d9f2e36f5dd71d321c76cde822",
          []
         ]
        }
       },
       "copyImageBitmapToTexture.spec.js": [
-       "b201bb49750c4f368fe6c39aa1462f1b026a3f69",
+       "42ad8507ec949c55c441cc3c2808ab8d6ebee7e5",
        []
       ],
       "examples.spec.js": [
@@ -351367,12 +351168,8 @@
        "af6482fcab508705e884cd205cf31f7b9762990a",
        []
       ],
-      "format_info.js": [
-       "5d54bbb8c51ecd39ddb4869ce29e46571726a0cc",
-       []
-      ],
       "gpu_test.js": [
-       "236e9eaeb9d10923d840ff9cbe885a9d534e9230",
+       "7ab5320d6e95c8c3914c26db5f0cc7ee7a0b0843",
        []
       ],
       "index.js": [
@@ -351381,33 +351178,33 @@
       ],
       "resource_init": {
        "sampled_texture_clear.spec.js": [
-        "66cee08addd60931f1192a6bf7bc97227b5b4130",
+        "a8fb1ad71d1ef0fa7030dd59a58733ad34fc0841",
         []
        ]
       },
       "validation": {
        "createBindGroup.spec.js": [
-        "22472f8dff2cf6b4d4206d7e29bc652a56466c4d",
+        "2f42a8b643d4905a5f15f3abc312e20ce569ecfa",
         []
        ],
        "createBindGroupLayout.spec.js": [
-        "22fa8f5d606e01841485d2567849db8dcd211168",
+        "b48db9598dd62fc933e14b08974c3aa4af6fbd63",
         []
        ],
        "createPipelineLayout.spec.js": [
-        "9d5394f925b6bec87b1ec7a01f9bd66aa994929e",
+        "0018c24e54075cf1551af3bbb1cb4d1977386907",
         []
        ],
        "createRenderPipeline.spec.js": [
-        "f6a555526559969c659c74a49d3035573fc013db",
+        "e4dd32af9e8de43bc29f8bd7ced45638d7a1e6a4",
         []
        ],
        "createTexture.spec.js": [
-        "08c6d1b50b596e32b780f08a7be6d370d0951a75",
+        "a7317a88f5badd9d65fc881a2a34a8cf652fdee0",
         []
        ],
        "createView.spec.js": [
-        "855d32a3f43990295513385ebbd161fa38d4f04a",
+        "a4fe7ac2a930ee9bec57528d743f119c8749b6fc",
         []
        ],
        "error_scope.spec.js": [
@@ -351423,7 +351220,7 @@
         []
        ],
        "render_pass.spec.js": [
-        "f788fb63d8d0cd0270516a9e51640cb95fdf4118",
+        "67f7bec6d66977fbb67539897d64ab0506a5f9f5",
         []
        ],
        "render_pass_descriptor.spec.js": [
@@ -351447,7 +351244,7 @@
         []
        ],
        "setVertexBuffer.spec.js": [
-        "ba22ee2d2a4e636e2b519003da669bbd33fead2d",
+        "47b861501296fbe517345a54ca7198e237cdf748",
         []
        ],
        "setViewport.spec.js": [
@@ -351459,7 +351256,7 @@
         []
        ],
        "vertex_state.spec.js": [
-        "cc33cde1decd5f42f006007e0e9381d50067babd",
+        "103a11265c573e7f2873da5893fb92aedcba14ee",
         []
        ]
       }
@@ -377189,7 +376986,7 @@
      ]
     ],
     "sec-ch-quotes.https.html": [
-     "edf4fce785e83a349a57c94371e5d22f867977ed",
+     "81fe09fb0494b1854c13b93606248ee0920777dd",
      [
       null,
       {}
@@ -377203,7 +377000,7 @@
      ]
     ],
     "sec-ch-ua.https.html": [
-     "b293745365a611475697aaa7b66a8a809cad7b3c",
+     "bc7a1a8f7d9eabaf71b4d1aed9e8df272edb6c3b",
      [
       null,
       {}
@@ -384507,7 +384304,7 @@
       ]
      ],
      "CSSAnimation-compositeOrder.tentative.html": [
-      "ee204db792666f176a72be43227c944185727f66",
+      "d55db9a2d117f54cebd447d9bf5ef9f44ab7309a",
       [
        null,
        {}
@@ -403485,6 +403282,13 @@
        {}
       ]
      ],
+     "viewport-units-after-font-load.html": [
+      "82e8b73d28dfc57ad572936fe46315d0d0289606",
+      [
+       null,
+       {}
+      ]
+     ],
      "viewport-units-css2-001.html": [
       "c51237dd8a07546d31eef6f6f9b3c84b6ac2b65b",
       [
@@ -425905,6 +425709,47 @@
         }
        ]
       ],
+      "cors-preflight-response-validation.any.js": [
+       "718e351c1d3f09aa41cc2ea7f7b071f4a7c48b2a",
+       [
+        "fetch/api/cors/cors-preflight-response-validation.any.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "/common/utils.js"
+          ],
+          [
+           "script",
+           "../resources/utils.js"
+          ],
+          [
+           "script",
+           "/common/get-host-info.sub.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "fetch/api/cors/cors-preflight-response-validation.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "script",
+           "/common/utils.js"
+          ],
+          [
+           "script",
+           "../resources/utils.js"
+          ],
+          [
+           "script",
+           "/common/get-host-info.sub.js"
+          ]
+         ]
+        }
+       ]
+      ],
       "cors-preflight-star.any.js": [
        "d76e9a21fd4b946803d8df193fcf00f53921aa9d",
        [
@@ -431673,6 +431518,15 @@
        {}
       ]
      ],
+     "cache-storage-reporting.https.html": [
+      "d9a23bed3effa4f3492a31eeb255224df106030e",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
      "coep-frame-javascript.https.html": [
       "d3e090bd7f7b08bbb75ec8541a1981d928a28e37",
       [
@@ -431755,10 +431609,12 @@
       ]
      ],
      "reporting.https.html": [
-      "bb0a6a2b0a8101665a25f2187c138ab0bdfd14e5",
+      "95fe047ea9fc6c7fe0bf33170d67df3e33a04544",
       [
        null,
-       {}
+       {
+        "timeout": "long"
+       }
       ]
      ],
      "require-corp-about-blank.html": [
@@ -432031,7 +431887,7 @@
       ]
      ],
      "iframe-popup-same-origin-to-same-origin.https.html": [
-      "635f7ab3b872c49c436a5cfcb387e63100322ea3",
+      "a38376c7fcf6ddc548267cb45467390211736868",
       [
        null,
        {
@@ -432040,7 +431896,7 @@
       ]
      ],
      "iframe-popup-same-origin-to-unsafe-none.https.html": [
-      "6589ad923c1fe2111f6a9865439284875d081b0f",
+      "4adb4130418ddb189443869f821fb2b235265b7d",
       [
        null,
        {
@@ -434965,6 +434821,13 @@
          {}
         ]
        ],
+       "img-aspect-ratio-lazy.tentative.html": [
+        "c058aa426de8d72b671f7eae5d36708d69c788c4",
+        [
+         null,
+         {}
+        ]
+       ],
        "img-aspect-ratio.html": [
         "eceef92a6418f3d74ffbd13a08d8e648dff42a3f",
         [
@@ -448176,7 +448039,7 @@
         ]
        ],
        "navigator_user_agent.https.html": [
-        "4c83c7e8a546dd8c4d37b56f5bdc70d80e23e910",
+        "0fb9e372b0dd6f5c6463430ee4012e5c040c4a80",
         [
          null,
          {}
@@ -448532,130 +448395,6 @@
       ]
      }
     },
-    "builtin-support.tentative": {
-     "bare.sub.tentative.html": [
-      "e20424aed8a728b31774b71ae98ab7d882df2987",
-      [
-       null,
-       {
-        "timeout": "long"
-       }
-      ]
-     ],
-     "builtin-empty.tentative.html": [
-      "9ede75a4c42067a989ee6abaf4728bdaa2d56694",
-      [
-       null,
-       {}
-      ]
-     ],
-     "builtin-import-scheme.tentative.html": [
-      "d9977ae3535c48ebb33e6d3e97bd9d6bab409bc4",
-      [
-       null,
-       {}
-      ]
-     ],
-     "builtin.tentative.html": [
-      "497bb5c606b7648bbdf9a3cd8990b462d9ab7787",
-      [
-       null,
-       {}
-      ]
-     ],
-     "data.sub.tentative.html": [
-      "0377a788491cea37ee42ab4a00fba6a5d0df7d73",
-      [
-       null,
-       {
-        "timeout": "long"
-       }
-      ]
-     ],
-     "fallback-disallowed.sub.tentative.html": [
-      "7efe90eb751d981012c7d382842001ba176a3b24",
-      [
-       null,
-       {
-        "timeout": "long"
-       }
-      ]
-     ],
-     "fallback.sub.tentative.html": [
-      "45cf6dc1ced1dc34ef7df4ea477a4a85dbee45ee",
-      [
-       null,
-       {
-        "timeout": "long"
-       }
-      ]
-     ],
-     "http.sub.tentative.html": [
-      "7689ae13bb5373201890794e7a51e72167e3317d",
-      [
-       null,
-       {}
-      ]
-     ],
-     "imported": {
-      "parsing-addresses.tentative.html": [
-       "0cc92ce3e5e4be7c44abaa41c5d26046feabc049",
-       [
-        null,
-        {}
-       ]
-      ],
-      "parsing-schema.tentative.html": [
-       "9e3bca2935bcf3f52fdfcb76eeb8339674f0db47",
-       [
-        null,
-        {}
-       ]
-      ],
-      "parsing-scope-keys.tentative.html": [
-       "be23c645d0bf071818f96c01b330a5efcab69594",
-       [
-        null,
-        {}
-       ]
-      ],
-      "parsing-specifier-keys.tentative.html": [
-       "7bc2d4799f1369750a8675f041c32f36f16c1e8f",
-       [
-        null,
-        {}
-       ]
-      ],
-      "resolving-builtins.tentative.html": [
-       "065cfa30964da0ec2958b4e95634804b8994056b",
-       [
-        null,
-        {}
-       ]
-      ],
-      "resolving-not-yet-implemented.tentative.html": [
-       "3bdd591fd0cba9f83c1bfb6a7e3274532efd2961",
-       [
-        null,
-        {}
-       ]
-      ],
-      "resolving-scopes.tentative.html": [
-       "33b49352ccdc3658022559907db7ac5a098ea698",
-       [
-        null,
-        {}
-       ]
-      ],
-      "resolving.tentative.html": [
-       "1d24eb2031e4097551d21df57f0c595957c695ee",
-       [
-        null,
-        {}
-       ]
-      ]
-     }
-    },
     "common": {
      "parsing.tentative.html": [
       "d3334d7bbb9b4406397f96b596e71463eb252791",
@@ -454252,34 +453991,6 @@
         ]
        },
        "sharedworker-classic": {
-        "cross-http.keep-scheme.https.html": [
-         "4d785b21f4acccddf824d9c55d9260801a8e576d",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-http.no-redirect.https.html": [
-         "a704db4d9347597b56d6d03256a02ec2f9341161",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-http.swap-scheme.https.html": [
-         "46a0e267366024e3d6c3a481f7b956ba6c6d2329",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-https.swap-scheme.https.html": [
-         "8bc14cb8c85a913a04ff2bd1d91f44d1ca453fd7",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-http.keep-scheme.https.html": [
          "cfada8433e001533b16182bfe788487c4f53ecb3",
          [
@@ -454294,13 +454005,6 @@
           {}
          ]
         ],
-        "same-http.swap-scheme.https.html": [
-         "0942ebd3591c7178b68ccb5deb486f69e26111ef",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-https.keep-scheme.https.html": [
          "66eb7541346c74cbf7ccb05170bd561e93f2e685",
          [
@@ -454314,13 +454018,6 @@
           null,
           {}
          ]
-        ],
-        "same-https.swap-scheme.https.html": [
-         "49b0614511afe69621f84207d1b2ee9a6d07a2d3",
-         [
-          null,
-          {}
-         ]
         ]
        },
        "sharedworker-import-data": {
@@ -454396,34 +454093,6 @@
         ]
        },
        "sharedworker-module": {
-        "cross-http.keep-scheme.https.html": [
-         "530dbe507a1c54addf6158816f79d5ce38d816eb",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-http.no-redirect.https.html": [
-         "b716ae6168b42611fba46ff8cf6cc8c3d327cd24",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-http.swap-scheme.https.html": [
-         "8696795c4de054e309c4c4ddd0653d5dac3bd881",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-https.swap-scheme.https.html": [
-         "12a66d42627ca9b1c624f0679b71a59152adc3da",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-http.keep-scheme.https.html": [
          "64f6d02f60c34cadd46e8538dcabfb0cea77aa8f",
          [
@@ -454438,13 +454107,6 @@
           {}
          ]
         ],
-        "same-http.swap-scheme.https.html": [
-         "e7cb04810b9f4cd5f600312ff9b10b3a86aabeac",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-https.keep-scheme.https.html": [
          "30d1a97fa6915703dab636160219cd669dce8c80",
          [
@@ -454458,13 +454120,6 @@
           null,
           {}
          ]
-        ],
-        "same-https.swap-scheme.https.html": [
-         "6601019864b19b62ab695867d306f72c56ad3a17",
-         [
-          null,
-          {}
-         ]
         ]
        },
        "video-tag": {
@@ -454563,34 +454218,6 @@
         ]
        },
        "worker-classic": {
-        "cross-http.keep-scheme.https.html": [
-         "8a915c29f9f45c37c998c4caa70f819c895f4d06",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-http.no-redirect.https.html": [
-         "5aabf759341371ad8323399f83c9160407e3ddca",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-http.swap-scheme.https.html": [
-         "90c204d7a0d0dff099916a14a1eeebbb15dbc3e0",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-https.swap-scheme.https.html": [
-         "cbc740ae3872c0c668597ea32e794304ce77018e",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-http.keep-scheme.https.html": [
          "93668db49e4f3d79d39ab72bc525db6353a4d74c",
          [
@@ -454605,13 +454232,6 @@
           {}
          ]
         ],
-        "same-http.swap-scheme.https.html": [
-         "d5f79ad60212c6ec0b48a5be3e9c6a492d4b7a69",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-https.keep-scheme.https.html": [
          "042bd14fa8160b38c7852c168748a6c70484e4a1",
          [
@@ -454625,13 +454245,6 @@
           null,
           {}
          ]
-        ],
-        "same-https.swap-scheme.https.html": [
-         "09ba5bc858e1e133a372f28935162b0370a08a21",
-         [
-          null,
-          {}
-         ]
         ]
        },
        "worker-import-data": {
@@ -454707,34 +454320,6 @@
         ]
        },
        "worker-module": {
-        "cross-http.keep-scheme.https.html": [
-         "69dcfb7e5cb5b30f24e0b181b3b3968542673f35",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-http.no-redirect.https.html": [
-         "816e3449092a398f12a7287b4d2715764aea56ac",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-http.swap-scheme.https.html": [
-         "9e167de1486d409caf0ba5ef4b41d434ad06315c",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-https.swap-scheme.https.html": [
-         "700b7dada6774c0540bd012a1be8b7ad6ed4d448",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-http.keep-scheme.https.html": [
          "75e103e634366ff03e22e11d32b0cefed280e1ce",
          [
@@ -454749,13 +454334,6 @@
           {}
          ]
         ],
-        "same-http.swap-scheme.https.html": [
-         "f0397f11b69a19ca884dfcaba8abd571d4ed1aa4",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-https.keep-scheme.https.html": [
          "b81758e5b79fa6fbf2b50c2118150087b06caef5",
          [
@@ -454769,13 +454347,6 @@
           null,
           {}
          ]
-        ],
-        "same-https.swap-scheme.https.html": [
-         "74f95a2620887f5bd4713272812cbc12bba8d53e",
-         [
-          null,
-          {}
-         ]
         ]
        },
        "worklet-animation": {
@@ -455638,13 +455209,6 @@
         ]
        },
        "sharedworker-classic": {
-        "cross-http.no-redirect.https.html": [
-         "3f17e742c30723418e6d05abfcdc645355b167c9",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-http.no-redirect.https.html": [
          "ae2f3db74f5ecb6bf3ac8b30baaf027d2494b55f",
          [
@@ -455684,13 +455248,6 @@
         ]
        },
        "sharedworker-module": {
-        "cross-http.no-redirect.https.html": [
-         "d4717590a42b634824b0d713ee3cb05b7de6a420",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-http.no-redirect.https.html": [
          "4100554d8415507bb4bc600e85974ee009faebbd",
          [
@@ -455753,13 +455310,6 @@
         ]
        },
        "worker-classic": {
-        "cross-http.no-redirect.https.html": [
-         "36ee4ed56d04f5f7b240a1760e17180c58ec8ed4",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-http.no-redirect.https.html": [
          "bdc906277b1d3fde69f8cfe558f77beed9c436ca",
          [
@@ -455799,13 +455349,6 @@
         ]
        },
        "worker-module": {
-        "cross-http.no-redirect.https.html": [
-         "87dd4d87ee0cea8d73f35e95a1f31eafa85669a9",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-http.no-redirect.https.html": [
          "e837b2cbbd2299165bade9dfaeffd0297289feab",
          [
@@ -456553,27 +456096,6 @@
         ]
        },
        "sharedworker-classic": {
-        "cross-http.keep-scheme.https.html": [
-         "4d785b21f4acccddf824d9c55d9260801a8e576d",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-http.no-redirect.https.html": [
-         "a704db4d9347597b56d6d03256a02ec2f9341161",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-http.swap-scheme.https.html": [
-         "46a0e267366024e3d6c3a481f7b956ba6c6d2329",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-http.keep-scheme.https.html": [
          "cfada8433e001533b16182bfe788487c4f53ecb3",
          [
@@ -456588,13 +456110,6 @@
           {}
          ]
         ],
-        "same-http.swap-scheme.https.html": [
-         "0942ebd3591c7178b68ccb5deb486f69e26111ef",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-https.keep-scheme.https.html": [
          "66eb7541346c74cbf7ccb05170bd561e93f2e685",
          [
@@ -456669,27 +456184,6 @@
         ]
        },
        "sharedworker-module": {
-        "cross-http.keep-scheme.https.html": [
-         "530dbe507a1c54addf6158816f79d5ce38d816eb",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-http.no-redirect.https.html": [
-         "b716ae6168b42611fba46ff8cf6cc8c3d327cd24",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-http.swap-scheme.https.html": [
-         "8696795c4de054e309c4c4ddd0653d5dac3bd881",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-http.keep-scheme.https.html": [
          "64f6d02f60c34cadd46e8538dcabfb0cea77aa8f",
          [
@@ -456704,13 +456198,6 @@
           {}
          ]
         ],
-        "same-http.swap-scheme.https.html": [
-         "e7cb04810b9f4cd5f600312ff9b10b3a86aabeac",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-https.keep-scheme.https.html": [
          "30d1a97fa6915703dab636160219cd669dce8c80",
          [
@@ -456808,27 +456295,6 @@
         ]
        },
        "worker-classic": {
-        "cross-http.keep-scheme.https.html": [
-         "8a915c29f9f45c37c998c4caa70f819c895f4d06",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-http.no-redirect.https.html": [
-         "5aabf759341371ad8323399f83c9160407e3ddca",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-http.swap-scheme.https.html": [
-         "90c204d7a0d0dff099916a14a1eeebbb15dbc3e0",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-http.keep-scheme.https.html": [
          "93668db49e4f3d79d39ab72bc525db6353a4d74c",
          [
@@ -456843,13 +456309,6 @@
           {}
          ]
         ],
-        "same-http.swap-scheme.https.html": [
-         "d5f79ad60212c6ec0b48a5be3e9c6a492d4b7a69",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-https.keep-scheme.https.html": [
          "042bd14fa8160b38c7852c168748a6c70484e4a1",
          [
@@ -456924,27 +456383,6 @@
         ]
        },
        "worker-module": {
-        "cross-http.keep-scheme.https.html": [
-         "69dcfb7e5cb5b30f24e0b181b3b3968542673f35",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-http.no-redirect.https.html": [
-         "816e3449092a398f12a7287b4d2715764aea56ac",
-         [
-          null,
-          {}
-         ]
-        ],
-        "cross-http.swap-scheme.https.html": [
-         "9e167de1486d409caf0ba5ef4b41d434ad06315c",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-http.keep-scheme.https.html": [
          "75e103e634366ff03e22e11d32b0cefed280e1ce",
          [
@@ -456959,13 +456397,6 @@
           {}
          ]
         ],
-        "same-http.swap-scheme.https.html": [
-         "f0397f11b69a19ca884dfcaba8abd571d4ed1aa4",
-         [
-          null,
-          {}
-         ]
-        ],
         "same-https.keep-scheme.https.html": [
          "b81758e5b79fa6fbf2b50c2118150087b06caef5",
          [
@@ -525717,7 +525148,7 @@
      ]
     ],
     "scroll-timeline-phases.tentative.html": [
-     "0cc4e12864e209602b8c3ad57106deb3927e5be8",
+     "48ca749d24d5725acaea0981cada6383f0b3a45b",
      [
       null,
       {}
@@ -538527,6 +537958,15 @@
      ]
     ]
    },
+   "trust-tokens": {
+    "trust-token-parameter-validation.tentative.https.html": [
+     "c3a612724ee8a0216f64b7a66434736df9def9a4",
+     [
+      null,
+      {}
+     ]
+    ]
+   },
    "trusted-types": {
     "DOMParser-parseFromString-regression.tentative.https.html": [
      "941d1750b4a3d4fd0c53a48c62689f9665e64dc3",
@@ -548355,7 +547795,7 @@
      },
      "DocumentOrShadowRoot": {
       "getAnimations.html": [
-       "f88ad432c1e4c4bd8b6a1e7e41acc07d761f0593",
+       "67addc05476fba7107fcc97b6783180093daf96f",
        [
         null,
         {}
@@ -548623,7 +548063,7 @@
        ]
       ],
       "update-and-send-events-replacement.html": [
-       "1391b97a8ae7fa3c84eab6002edf0f87414b56b7",
+       "fced6ead657cc7a37110b156efe79b4d6cf63ccb",
        [
         null,
         {}
@@ -553482,7 +552922,7 @@
     ],
     "protocol": {
      "bundle.https.html": [
-      "fcc9d470b9f7c5c4215da09666e471dfa0a192d1",
+      "61d1ff8ac108297dafe333694ddd1194ff53fe26",
       [
        null,
        {}
@@ -586187,34 +585627,6 @@
        {}
       ]
      ],
-     "flex-wrap-001.htm": [
-      "127100ac0ad9dc5c14e170a346dce38d114a0c99",
-      [
-       null,
-       {}
-      ]
-     ],
-     "flex-wrap_nowrap.html": [
-      "ef53bb2decb00a9ee881ddcc96d350428b036595",
-      [
-       null,
-       {}
-      ]
-     ],
-     "flex-wrap_wrap-reverse.html": [
-      "ce23e935ecc88bb5eade812237bcd4e1088d04b5",
-      [
-       null,
-       {}
-      ]
-     ],
-     "flex-wrap_wrap.html": [
-      "302c9cd325b51c5de485b79e4107b36c0b68dd77",
-      [
-       null,
-       {}
-      ]
-     ],
      "flexbox-order-from-lowest.html": [
       "34bc0276019d03c0dcf4121f412b3eb4a50260d1",
       [
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
new file mode 100644
index 00000000000..4bfb0c2053a
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-004.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-flexbox/ttwf-reftest-flex-wrap-reverse.html.ini b/tests/wpt/metadata/css/css-flexbox/ttwf-reftest-flex-wrap-reverse.html.ini
deleted file mode 100644
index 82143bf13e7..00000000000
--- a/tests/wpt/metadata/css/css-flexbox/ttwf-reftest-flex-wrap-reverse.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[ttwf-reftest-flex-wrap-reverse.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/ttwf-reftest-flex-wrap.html.ini b/tests/wpt/metadata/css/css-flexbox/ttwf-reftest-flex-wrap.html.ini
deleted file mode 100644
index d72859e7ab1..00000000000
--- a/tests/wpt/metadata/css/css-flexbox/ttwf-reftest-flex-wrap.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[ttwf-reftest-flex-wrap.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-values/viewport-units-after-font-load.html.ini b/tests/wpt/metadata/css/css-values/viewport-units-after-font-load.html.ini
new file mode 100644
index 00000000000..5ac32f7d317
--- /dev/null
+++ b/tests/wpt/metadata/css/css-values/viewport-units-after-font-load.html.ini
@@ -0,0 +1,5 @@
+[viewport-units-after-font-load.html]
+  expected: TIMEOUT
+  [Viewport units are correctly updated after resize even if a font load has happened before]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-preflight-response-validation.any.js.ini b/tests/wpt/metadata/fetch/api/cors/cors-preflight-response-validation.any.js.ini
new file mode 100644
index 00000000000..1370c6b59af
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/cors/cors-preflight-response-validation.any.js.ini
@@ -0,0 +1,15 @@
+[cors-preflight-response-validation.any.html]
+  [Preflight response with a bad Access-Control-Allow-Methods]
+    expected: FAIL
+
+  [Preflight response with a bad Access-Control-Allow-Headers]
+    expected: FAIL
+
+
+[cors-preflight-response-validation.any.worker.html]
+  [Preflight response with a bad Access-Control-Allow-Methods]
+    expected: FAIL
+
+  [Preflight response with a bad Access-Control-Allow-Headers]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 00e3a2e05f1..0dc412ed582 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,24 +312,24 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
   [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html */*]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 5c001592859..b2ffc8abf78 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,6 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252 error text/javascript]
+  [separate text/javascript error]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 61682d248e2..30e1b851fd4 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%2C%2C%40%23%24%23%25%25%26%5E%26%5E*()()11!]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20%40%23%24%23%25%25%26%5E%26%5E*()()11!%2Cnosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
new file mode 100644
index 00000000000..385376c7321
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_4.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
index bc08ec856bc..ced66541669 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
@@ -18,6 +18,3 @@
   [Set HTTP URL frame location.protocol to ftp]
     expected: FAIL
 
-  [Set data URL frame location.protocol to file]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-lazy.tentative.html.ini b/tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-lazy.tentative.html.ini
new file mode 100644
index 00000000000..55d3ea43ecd
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-lazy.tentative.html.ini
@@ -0,0 +1,4 @@
+[img-aspect-ratio-lazy.tentative.html]
+  [Image width and height attributes are used to infer aspect-ratio for lazy-loaded images]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index b3bd9f4c289..5f60c78e73c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
index 795de9f94db..47eef97b8c3 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/audiobuffersource-multi-channels.html.ini
@@ -53,3 +53,6 @@
   [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 40534 more errors.\n\tMax AbsError of 1.9986916780471802e+0 at index of 29020.\n\t[29020\]\t9.9994289875030518e-1\t-9.9874877929687500e-1\t1.9986916780471802e+0\t2.0011956154322119e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 12348.\n\t[12348\]\t9.5105654001235962e-1\t0.0000000000000000e+0\t9.5105654001235962e-1\tInfinity\t3.0517578125000000e-5\n]
     expected: FAIL
 
+  [X Rendered audio for channel 5 does not equal [0,0.0626220703125,0.125030517578125,0.18695068359375,0.24810791015625,0.308319091796875,0.3673095703125,0.42486572265625,0.480743408203125,0.53472900390625,0.58660888671875,0.636199951171875,0.68328857421875,0.727691650390625,0.76922607421875,0.8077392578125...\] with an element-wise tolerance of {"absoluteThreshold":0.000030517578125,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[1\]\t3.6732959747314453e-1\t6.2622070312500000e-2\t3.0470752716064453e-1\t4.8658168859649127e+0\t3.0517578125000000e-5\n\t[2\]\t6.8329977989196777e-1\t1.2503051757812500e-1\t5.5826926231384277e-1\t4.4650639949963384e+0\t3.0517578125000000e-5\n\t[3\]\t9.0373212099075317e-1\t1.8695068359375000e-1\t7.1678143739700317e-1\t3.8340669508039502e+0\t3.0517578125000000e-5\n\t[4\]\t9.9780619144439697e-1\t2.4810791015625000e-1\t7.4969828128814697e-1\t3.0216621502152523e+0\t3.0517578125000000e-5\n\t[5\]\t9.5236867666244507e-1\t3.0831909179687500e-1\t6.4404958486557007e-1\t2.0889059484187866e+0\t3.0517578125000000e-5\n\t...and 44049 more errors.\n\tMax AbsError of 1.9985756278038025e+0 at index of 16692.\n\t[16692\]\t9.9997943639755249e-1\t-9.9859619140625000e-1\t1.9985756278038025e+0\t2.0013851895322721e+0\t3.0517578125000000e-5\n\tMax RelError of Infinity at index of 10584.\n\t[10584\]\t-5.8778524398803711e-1\t0.0000000000000000e+0\t5.8778524398803711e-1\tInfinity\t3.0517578125000000e-5\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 1085df9225f..c1a19445ebb 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -206,3 +206,9 @@
   [X Stitched sine-wave buffers at sample rate 44100 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.000090957,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[31080\]\t7.7856257262238438e-27\t5.6332010030746460e-1\t5.6332010030746460e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\t[31081\]\t4.5762203949455551e-41\t6.1397600173950195e-1\t6.1397600173950195e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 6.1397600173950195e-1 at index of 31081.\n\tMax RelError of 1.0000000000000000e+0 at index of 31080.\n]
     expected: FAIL
 
+  [X SNR (45.018638895477395 dB) is not greater than or equal to 85.58. Got 45.018638895477395.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 44100 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.000090957,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[31080\]\t2.1915524950344434e-12\t5.6332010030746460e-1\t5.6332010030527302e-1\t9.9999999999610956e-1\t9.0957000000000003e-5\n\t[31081\]\t4.5863097438886938e-41\t6.1397600173950195e-1\t6.1397600173950195e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 6.1397600173950195e-1 at index of 31081.\n\tMax RelError of 1.0000000000000000e+0 at index of 31081.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini b/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
index 10dda3a6659..6d92f8835c6 100644
--- a/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
+++ b/tests/wpt/metadata/workers/shared-worker-in-data-url-context.window.js.ini
@@ -1,7 +1,8 @@
 [shared-worker-in-data-url-context.window.html]
+  expected: TIMEOUT
   [Create a shared worker in a data url frame]
-    expected: FAIL
+    expected: TIMEOUT
 
   [Create a data url shared worker in a data url frame]
-    expected: FAIL
+    expected: NOTRUN
 
diff --git a/tests/wpt/web-platform-tests/client-hints/resources/echo-ua-client-hints-received.py b/tests/wpt/web-platform-tests/client-hints/resources/echo-ua-client-hints-received.py
index 9cf1f8e32ff..4af98c75cce 100644
--- a/tests/wpt/web-platform-tests/client-hints/resources/echo-ua-client-hints-received.py
+++ b/tests/wpt/web-platform-tests/client-hints/resources/echo-ua-client-hints-received.py
@@ -13,6 +13,7 @@ def main(request, response):
         "sec-ch-ua-arch",
         "sec-ch-ua-platform",
         "sec-ch-ua-model",
+        "sec-ch-ua-full-version",
     ]
 
     request_client_hints = {i: request.headers.get(i) for i in client_hint_headers}
diff --git a/tests/wpt/web-platform-tests/client-hints/sec-ch-quotes.https.html b/tests/wpt/web-platform-tests/client-hints/sec-ch-quotes.https.html
index edf4fce785e..81fe09fb049 100644
--- a/tests/wpt/web-platform-tests/client-hints/sec-ch-quotes.https.html
+++ b/tests/wpt/web-platform-tests/client-hints/sec-ch-quotes.https.html
@@ -5,21 +5,53 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/utils.js"></script>
 <script>
+const verify_headers = (header_list, response, verification_func) => {
+  header_list.forEach(header => {
+    const value = response.headers.get(header+"-recieved");
+    if(value) {
+      verification_func(value);
+    }
+  });
+};
+
 promise_test(async (test) => {
-  var request_token = token();
-  var client_hint_headers = [
+  const request_token = token();
+  const string_list_client_hint_headers = [
     "sec-ch-ua",
+  ];
+  const string_client_hint_headers = [
     "sec-ch-ua-arch",
     "sec-ch-ua-platform",
     "sec-ch-ua-model",
+    "sec-ch-ua-full-version",
+  ];
+  const boolean_client_hint_headers = [
+    "sec-ch-mobile",
   ];
 
   const response = await fetch("resources/echo-ua-client-hints-received.py");
-  client_hint_headers.forEach(header => {
-    if(response.headers.get(header+"-recieved")) {
+  verify_headers(string_client_hint_headers, response, value => {
+    if(value) {
       // Check that the hints have quotes
-      assert_equals(response.headers.get(header+"-recieved").slice(0,1), "\"");
-      assert_equals(response.headers.get(header+"-recieved").slice(-1), "\"");
+      // TODO(yoav): this doesn't account for parameters. Need an SH parser, that verifies no parameters are present.
+      assert_equals(value.slice(0,1), "\"");
+      assert_equals(value.slice(-1), "\"");
+    }
+  });
+  verify_headers(string_list_client_hint_headers, response, value => {
+    // Check that the hints have quotes
+    // TODO(yoav): this doesn't account for list parsing or parameters. Need an SH parser, that verifies this is a list of strings with a "v" parameter present in at least one value.
+    assert_false((typeof value) == "undefined");
+    assert_equals(value.slice(0,1), "\"");
+    assert_equals(value.slice(-1), "\"");
+  });
+  verify_headers(boolean_client_hint_headers, response, value => {
+    if(value) {
+      // Check that the value is a valid boolean
+      assert_false((typeof value) == "undefined");
+      assert_equals(value.slice(0,1), "?");
+      const num = value.slice(-1);
+      assert_true(num == "0" || num == "1");
     }
   });
 }, 'User agent client hint header values are surrounded by quotes');
diff --git a/tests/wpt/web-platform-tests/client-hints/sec-ch-ua.https.html b/tests/wpt/web-platform-tests/client-hints/sec-ch-ua.https.html
index b293745365a..bc7a1a8f7d9 100644
--- a/tests/wpt/web-platform-tests/client-hints/sec-ch-ua.https.html
+++ b/tests/wpt/web-platform-tests/client-hints/sec-ch-ua.https.html
@@ -27,7 +27,7 @@
       window.onmessage = e => {
         try {
           assert_not_equals(e.data.header, "", "The `Sec-CH-UA` header is delivered.");
-          assert_not_equals(e.data.header, minor, "The `Sec-CH-UA` header is different after the opt-in than before.");
+          assert_equals(e.data.header, minor, "The `Sec-CH-UA` header did not change after the opt-in.");
         } catch (ex) {
           reject(ex);
         }
diff --git a/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-compositeOrder.tentative.html b/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-compositeOrder.tentative.html
index ee204db7926..d55db9a2d11 100644
--- a/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-compositeOrder.tentative.html
+++ b/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-compositeOrder.tentative.html
@@ -42,9 +42,9 @@ promise_test(async t => {
   const animA = div.animate({margin: ["100px","100px"]}, 100000);
   assert_equals(getComputedStyle(div).marginLeft, '100px');
   div.style.animation = 'margin50 100s';
-  assert_equals(getComputedStyle(div).marginLeft, '50px');
   // Wait for animation starts
-  await waitForAnimationFrames(2);
+  await animA.ready;
+  await waitForAnimationFrames(1);
   assert_equals(getComputedStyle(div).marginLeft, '100px',
                 "A higher-priority animation is not overriden by a more recent"
                 + "one.");
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-001.htm b/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-001.htm
deleted file mode 100644
index 127100ac0ad..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap-001.htm
+++ /dev/null
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD//XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <title>CSS Test: A flex container with 'flex-flow' set to 'wrap'</title>
-        <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-        <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-wrap-property" />
-        <meta name="flags" content="">
-        <meta name="assert" content="This test checks that the flex container with 'flex-flow: wrap' is a multi-line flex container." />
-        <style type="text/css">
-            #flexbox
-            {
-                background-color: red;
-                display: flex;
-                flex-flow: wrap;
-                height: 100px;
-                width: 300px;
-            }
-            div div
-            {
-                background-color: orange;
-                width: 150px;
-            }
-            .blue
-            {
-                background-color: blue;
-            }
-        </style>
-    </head>
-    <body>
-        <p>Test passes if there is a single blue rectangle on the left, a single orange rectangle directly to its right, and there is no red visible on the page.</p>
-        <div id="flexbox">
-            <div class="blue"></div>
-            <div></div>
-            <div class="blue"></div>
-            <div></div>
-        </div>
-    </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap_nowrap.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap_nowrap.html
deleted file mode 100644
index ef53bb2decb..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap_nowrap.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>CSS Flexible Box Test: flex-wrap_nowrap</title>
-    <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-wrap-property" />
-    <link rel="stylesheet" href="support/test-style.css">
-    <meta name="flags" content="" />
-    <meta name="assert" content="Check if the web engine can identify the flex-wrap value nowrap." />
-    <style>
-      #test{
-        width: 120px;
-        display: flex;
-		flex-wrap: wrap;
-	    flex-wrap: nowrap;
-      }
-    </style>
-  </head>
-  <body>
-    <p>Test passes if:<br>
-    1. the rectangle 1, 2, 3 show up in a row and no gap between them.</p>
-    <div id=test><div id=test01>1</div><div id=test02>2</div><div id=test03>3</div></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap_wrap-reverse.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap_wrap-reverse.html
deleted file mode 100644
index ce23e935ecc..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap_wrap-reverse.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>CSS Flexible Box Test: flex-wrap_wrap-reverse</title>
-    <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-wrap-property" />
-    <link rel="stylesheet" href="support/test-style.css">
-    <meta name="flags" content="" />
-    <meta name="assert" content="Check if the web engine can identify the flex-wrap value wrap-reverse." />
-    <style>
-      #test{
-	width: 120px;
-        display: flex;
-	flex-wrap: wrap-reverse;
-      }
-    </style>
-  </head>
-  <body>
-    <p>Test passes if:<br>
-    1. the rectangle 1, 2, 3 show up in two rows in a red rectangle and no gap between them.<br>
-    2. the rectangle 3 appear in the first line of rows.<br>
-    3. the rectangles appear in upper left of the red rectangle.</p>
-    <div id=test><div id=test01>1</div><div id=test02>2</div><div id=test03>3</div></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap_wrap.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap_wrap.html
deleted file mode 100644
index 302c9cd325b..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/flex-wrap_wrap.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>CSS Flexible Box Test: flex-wrap_wrap</title>
-    <link rel="author" title="Intel" href="http://www.intel.com" />
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-wrap-property" />
-    <link rel="stylesheet" href="support/test-style.css">
-    <meta name="flags" content="" />
-    <meta name="assert" content="Check if the display can recognize inline-flex value." />
-    <style>
-      div#test{
-        width: 120px;
-        display: flex;
-	flex-wrap: wrap;
-      }
-    </style>
-  </head>
-  <body>
-    <p>Test passes if:<br>
-    1. the rectangle 1, 2, 3 show up in two rows in a red rectangle and no gap between them.<br>
-    2. the rectangle 1 appear in the first line of rows.<br>
-    3. the rectangles appear in upper left of the red rectangle.</p>
-    <div id=test><div id=test01>1</div><div id=test02>2</div><div id=test03>3</div></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/ttwf-reftest-flex-wrap-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/reference/ttwf-reftest-flex-wrap-ref.html
deleted file mode 100644
index bb3e2b947af..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/reference/ttwf-reftest-flex-wrap-ref.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>CSS Flexible Box Test: flex-wrap proprety - wrap</title>
-    <link rel="author" title="haosdent" href="mailto:haosdent@gmail.com">
-    <style type="text/css">
-        /* Positioned container allows for the self-describing statement to still
-           be visible in the case of failure */
-        .container {
-            position: relative;
-            background: red;
-            margin: 1em 0;
-            border: 1px solid black;
-            width: 20em;
-            height: 6.5em;
-        }
-        span {
-            display: inline-block;
-            background: green;
-            color: white;
-            margin: 1em;
-            width: 8em;
-            float: left;
-        }
-    </style>
-</head>
-<body>
-    <p>The test passed if you see a 2 * 2 table on the page.</p>
-    <div class="container">
-      <span>first</span>
-      <span>second</span>
-      <span>third</span>
-      <span>forth</span>
-    </div>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/ttwf-reftest-flex-wrap-reverse-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/reference/ttwf-reftest-flex-wrap-reverse-ref.html
deleted file mode 100644
index fe6e510ccab..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/reference/ttwf-reftest-flex-wrap-reverse-ref.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>CSS Flexible Box Test: flex-wrap proprety - wrap-reverse</title>
-    <link rel="author" title="haosdent" href="mailto:haosdent@gmail.com">
-    <style type="text/css">
-        /* Positioned container allows for the self-describing statement to still
-           be visible in the case of failure */
-        .container {
-            position: relative;
-            background: red;
-            margin: 1em 0;
-            border: 1px solid black;
-            width: 20em;
-            height: 6.5em;
-        }
-        span {
-            display: inline-block;
-            background: green;
-            color: white;
-            margin: 1em;
-            width: 8em;
-            float: left;
-        }
-    </style>
-</head>
-<body>
-    <p>The test passed if you see a 2 * 2 table on the page and the order of them are reversed.</p>
-    <div class="container">
-      <span>third</span>
-      <span>forth</span>
-      <span>first</span>
-      <span>second</span>
-    </div>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/ttwf-reftest-flex-wrap-reverse.html b/tests/wpt/web-platform-tests/css/css-flexbox/ttwf-reftest-flex-wrap-reverse.html
deleted file mode 100644
index f2aefa29e8b..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/ttwf-reftest-flex-wrap-reverse.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>CSS Flexible Box Test: flex-wrap proprety - wrap-reverse</title>
-    <link rel="author" title="haosdent" href="mailto:haosdent@gmail.com">
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-wrap-property">
-    <link rel="match" href="reference/ttwf-reftest-flex-wrap-reverse-ref.html">
-    <meta name="assert" content="Statement describing what the test case is asserting">
-    <style type="text/css">
-        /* Positioned container allows for the self-describing statement to still
-           be visible in the case of failure */
-        .container {
-            position: relative;
-            display: flex;
-            flex-wrap: wrap-reverse;
-            background: red;
-            margin: 1em 0;
-            border: 1px solid black;
-            width: 20em;
-            height: 6.5em;
-        }
-        span {
-            display: inline-block;
-            background: green;
-            color: white;
-            margin: 1em;
-            width: 8em;
-        }
-    </style>
-</head>
-<body>
-    <p>The test passed if you see a 2 * 2 table on the page and the order of them are reversed.</p>
-    <div class="container">
-      <span>first</span>
-      <span>second</span>
-      <span>third</span>
-      <span>forth</span>
-    </div>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/ttwf-reftest-flex-wrap.html b/tests/wpt/web-platform-tests/css/css-flexbox/ttwf-reftest-flex-wrap.html
deleted file mode 100644
index 3acd79c4650..00000000000
--- a/tests/wpt/web-platform-tests/css/css-flexbox/ttwf-reftest-flex-wrap.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>CSS Flexible Box Test: flex-wrap proprety - wrap</title>
-    <link rel="author" title="haosdent" href="mailto:haosdent@gmail.com">
-    <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#flex-wrap-property">
-    <link rel="match" href="reference/ttwf-reftest-flex-wrap-ref.html">
-    <meta name="assert" content="Statement describing what the test case is asserting">
-    <style type="text/css">
-        /* Positioned container allows for the self-describing statement to still
-           be visible in the case of failure */
-        .container {
-            position: relative;
-            display: flex;
-            flex-wrap: wrap;
-            background: red;
-            margin: 1em 0;
-            border: 1px solid black;
-            width: 20em;
-            height: 6.5em;
-        }
-        span {
-            display: inline-block;
-            background: green;
-            color: white;
-            margin: 1em;
-            width: 8em;
-        }
-    </style>
-</head>
-<body>
-    <p>The test passed if you see a 2 * 2 table on the page.</p>
-    <div class="container">
-      <span>first</span>
-      <span>second</span>
-      <span>third</span>
-      <span>forth</span>
-    </div>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/css-values/viewport-units-after-font-load.html b/tests/wpt/web-platform-tests/css/css-values/viewport-units-after-font-load.html
new file mode 100644
index 00000000000..82e8b73d28d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-values/viewport-units-after-font-load.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Values: Viewport units are computed correctly after font load.</title>
+<link rel="author"  title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author"  title="Mozilla" href="https://mozilla.org">
+<link rel="help" href="https://drafts.csswg.org/css-values-4/#viewport-relative-lengths">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1620359">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<iframe width=300 height=300 scrolling=no srcdoc=""></iframe>
+<script>
+let t = async_test("Viewport units are correctly updated after resize even if a font load has happened before");
+let iframe = document.querySelector("iframe");
+onload = t.step_func(function() {
+  let doc = iframe.contentDocument;
+  let win = iframe.contentWindow;
+  doc.body.innerHTML = `
+    <div style="width: 100vw; height: 100vh; background: green"></div>
+  `;
+  let div = doc.querySelector("div");
+  let oldWidth = win.getComputedStyle(div).width;
+  let oldHeight = win.getComputedStyle(div).height;
+  assert_equals(oldWidth, win.innerWidth + "px", "Should fill the viewport");
+  assert_equals(oldHeight, win.innerHeight + "px", "Should fill the viewport");
+  let link = doc.createElement("link");
+  link.rel = "stylesheet";
+  link.href = "/fonts/ahem.css";
+  link.onload = t.step_func(function() {
+    iframe.width = 400;
+    win.requestAnimationFrame(t.step_func(function() {
+      win.requestAnimationFrame(t.step_func_done(function() {
+        let newWidth = win.getComputedStyle(div).width;
+        let newHeight = win.getComputedStyle(div).height;
+        assert_equals(newWidth, win.innerWidth + "px", "Should fill the viewport");
+        assert_equals(newHeight, win.innerHeight + "px", "Should fill the viewport");
+        assert_equals(newHeight, oldHeight, "Height shouldn't have changed");
+        assert_not_equals(newWidth, oldWidth, "Width should have changed");
+      }));
+    }));
+  });
+  doc.body.appendChild(link);
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-response-validation.any.js b/tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-response-validation.any.js
new file mode 100644
index 00000000000..718e351c1d3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/api/cors/cors-preflight-response-validation.any.js
@@ -0,0 +1,33 @@
+// META: script=/common/utils.js
+// META: script=../resources/utils.js
+// META: script=/common/get-host-info.sub.js
+
+function corsPreflightResponseValidation(desc, corsUrl, allowHeaders, allowMethods) {
+  var uuid_token = token();
+  var url = corsUrl;
+  var requestInit = {"mode": "cors"};
+  /* Force preflight */
+  requestInit["headers"] = {"x-force-preflight": ""};
+
+  var urlParameters = "?token=" + uuid_token + "&max_age=0";
+  urlParameters += "&allow_headers=x-force-preflight";
+  if (allowHeaders)
+    urlParameters += "," + allowHeaders;
+  if (allowMethods)
+    urlParameters += "&allow_methods="+ allowMethods;
+
+  promise_test(function(test) {
+    return fetch(RESOURCES_DIR + "clean-stash.py?token=" + uuid_token).then(async function(resp) {
+      assert_equals(resp.status, 200, "Clean stash response's status is 200");
+      await promise_rejects_js(test, TypeError, fetch(url + urlParameters, requestInit));
+
+      return fetch(url + urlParameters).then(function(resp) {
+        assert_equals(resp.headers.get("x-did-preflight"), "1", "Preflight request has been made");
+      });
+    });
+  }, desc);
+}
+
+var corsUrl = get_host_info().HTTP_REMOTE_ORIGIN + dirname(location.pathname) + RESOURCES_DIR + "preflight.py";
+corsPreflightResponseValidation("Preflight response with a bad Access-Control-Allow-Headers", corsUrl, "Bad value", null);
+corsPreflightResponseValidation("Preflight response with a bad Access-Control-Allow-Methods", corsUrl, null, "Bad value");
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting.https.html
new file mode 100644
index 00000000000..d9a23bed3ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cache-storage-reporting.https.html
@@ -0,0 +1,237 @@
+<!doctype html>
+<html>
+<head>
+  <title> Check COEP report are send for CacheStorage requests</title>
+  <meta name="timeout" content="long">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/common/get-host-info.sub.js"></script>
+  <script src="/common/utils.js"></script>
+  <script src="/service-workers/service-worker/resources/test-helpers.sub.js">
+  </script>
+</head>
+<script>
+
+function remote(path) {
+  const REMOTE_ORIGIN = get_host_info().HTTPS_REMOTE_ORIGIN;
+  return new URL(path, REMOTE_ORIGIN);
+}
+
+function local(path) {
+  return new URL(path, location.origin);
+}
+
+let encode = function(url) {
+  return encodeURI(url).replace(/\;/g,"%3B");
+}
+
+const resource_path = (new URL("./resources", location)).pathname;
+const report_token= token();
+const report_endpoint_url = local(resource_path + `/report.py?key=${report_token}`)
+const endpoint =
+{
+   "group":"endpoint",
+   "max_age":3600,
+   "endpoints":[{ "url":report_endpoint_url.toString() }]
+};
+let endpoint_string =
+  JSON.stringify(endpoint)
+   .replace(/,/g, "\\,")
+   .replace(/\(/g, "\\\(")
+   .replace(/\)/g, "\\\)=");
+const header_report_to = `|header(report-to,${endpoint_string})`;
+const header_coep =
+  '|header(Cross-Origin-Embedder-Policy,require-corp;report-to="endpoint")';
+const header_coep_report_only =
+  '|header(Cross-Origin-Embedder-Policy-Report-Only,require-corp;report-to="endpoint")';
+const SW_SCOPE = local(resource_path + "/");
+const header_service_worker_allowed =
+  `|header(service-worker-allowed,${SW_SCOPE})`;
+
+const iframe_path = resource_path + "/iframe.html?pipe=";
+const worker_path = resource_path + "/universal-worker.js?pipe=";
+const image_url = remote("/images/blue.png");
+
+// This script attempt to load a COEP:require-corp CORP:undefined response from
+// the CacheStorage.
+//
+// Executed from different context:
+// - A Document
+// - A ServiceWorker
+// - A DedicatedWorker
+// - A SharedWorker
+//
+// The context has either COEP or COEP-Report-Only defined.
+const eval_script = `
+  (async function() {
+    try {
+      const cache = await caches.open('v1');
+      const request = new Request('${image_url}', { mode: 'no-cors' });
+      const response = await cache.match(request);
+    } catch(e) {
+    }
+  })()
+`;
+
+promise_setup(async (t) => {
+  const cache = await caches.open('v1');
+  const fetch_request = new Request(image_url, {mode: 'no-cors'});
+  const fetch_response = await fetch(fetch_request);
+  await cache.put(fetch_request, fetch_response);
+}, "Setup: store a CORS:cross-origin COEP:none response into CacheStorage")
+
+async function makeIframe(test, iframe_url) {
+  const iframe = document.createElement("iframe");
+  test.add_cleanup(() => iframe.remove());
+  iframe.src = iframe_url;
+  const iframe_loaded = new Promise(resolve => iframe.onload = resolve);
+  document.body.appendChild(iframe);
+  await iframe_loaded;
+  return iframe;
+}
+
+function wait(ms) {
+  return new Promise(resolve => step_timeout(resolve, ms));
+}
+
+async function fetchReport() {
+  const fetch_report_path = resource_path + `/report.py?key=${report_token}`;
+  for(let i = 0; i<10; ++i) {
+    const response = await fetch(encode(fetch_report_path));
+    const reports = await response.json();
+    if (reports.length == 0) {
+      wait(100);
+      continue;
+    }
+    if (reports.length != 1)
+      throw "Too many reports received";
+
+    return reports[0];
+  }
+  throw "Report not send";
+}
+
+// Remove parts of the URL that are differ at runtime.
+function normalize(url) {
+  url = new URL(url);
+  return url.origin + url.pathname;
+}
+
+promise_test(async (t) => {
+  const iframe_url =
+    local(encode(iframe_path + header_coep + header_report_to));
+  const iframe = await makeIframe(t, iframe_url);
+  iframe.contentWindow.postMessage(eval_script);
+  const report = await fetchReport();
+  assert_equals(report["body"]["blocked-url"], image_url.toString());
+  assert_equals(report["body"]["type"], "corp");
+  assert_equals(report["type"], "coep");
+  assert_equals(normalize(report["url"]), normalize(iframe_url.toString()));
+}, "COEP support on document.")
+
+promise_test(async (t) => {
+  const iframe_url =
+    local(encode(iframe_path + header_coep_report_only + header_report_to));
+  const iframe = await makeIframe(t, iframe_url);
+  iframe.contentWindow.postMessage(eval_script);
+  const report = await fetchReport();
+  assert_equals(report["body"]["blocked-url"], image_url.toString());
+  assert_equals(report["body"]["type"], "corp");
+  assert_equals(report["type"], "coep");
+  assert_equals(normalize(report["url"]), normalize(iframe_url.toString()));
+}, "COEP-Report-Only support on document.")
+
+promise_test(async (t) => {
+  const worker_url = local(encode(worker_path));
+  const iframe_url =
+    local(encode(iframe_path + header_coep + header_report_to));
+  dedicated_worker_script = `
+    (async function() {
+      const w = new Worker('${worker_url}');
+      w.postMessage(\`${eval_script}\`);
+    })();
+  `;
+  const iframe = await makeIframe(t, iframe_url);
+  iframe.contentWindow.postMessage(dedicated_worker_script);
+  const report = await fetchReport();
+  assert_equals(report["body"]["blocked-url"], image_url.toString());
+  assert_equals(report["body"]["type"], "corp");
+  assert_equals(report["type"], "coep");
+  assert_equals(normalize(report["url"]), normalize(worker_url.toString()));
+}, "COEP support on DedicatedWorker.")
+
+promise_test(async (t) => {
+  const worker_url = local(encode(worker_path));
+  const iframe_url =
+    local(encode(iframe_path + header_coep_report_only + header_report_to));
+  dedicated_worker_script = `
+    (async function() {
+      const w = new Worker('${worker_url}');
+      w.postMessage(\`${eval_script}\`);
+    })();
+  `;
+  const iframe = await makeIframe(t, iframe_url);
+  iframe.contentWindow.postMessage(dedicated_worker_script);
+  const report = await fetchReport();
+  assert_equals(report["body"]["blocked-url"], image_url.toString());
+  assert_equals(report["body"]["type"], "corp");
+  assert_equals(report["type"], "coep");
+  assert_equals(normalize(report["url"]), normalize(worker_url.toString()));
+}, "COEP-Report-Only support on DedicatedWorker.")
+
+promise_test(async (t) => {
+  const worker_url =
+    local(encode(worker_path + header_coep + header_report_to));
+  const worker = new Worker(worker_url);
+  worker.postMessage(eval_script);
+  const report = await fetchReport();
+  assert_equals(report["body"]["blocked-url"], image_url.toString());
+  assert_equals(report["body"]["type"], "corp");
+  assert_equals(report["type"], "coep");
+  assert_equals(normalize(report["url"]), normalize(worker_url.toString()));
+}, "COEP support on SharedWorker.")
+
+promise_test(async (t) => {
+  const worker_url =
+    local(encode(worker_path + header_coep_report_only + header_report_to));
+  const worker = new Worker(worker_url);
+  worker.postMessage(eval_script);
+  const report = await fetchReport();
+  assert_equals(report["body"]["blocked-url"], image_url.toString());
+  assert_equals(report["body"]["type"], "corp");
+  assert_equals(report["type"], "coep");
+  assert_equals(normalize(report["url"]), normalize(worker_url.toString()));
+}, "COEP-Report-Only support on SharedWorker.")
+
+promise_test(async (t) => {
+  const worker_url =
+    local(encode(worker_path + header_coep + header_service_worker_allowed));
+  const reg =
+    await service_worker_unregister_and_register(t, worker_url, SW_SCOPE);
+  add_completion_callback(() => reg.unregister());
+  const worker = reg.installing || reg.waiting || reg.active;
+  worker.postMessage(eval_script);
+  const report = await fetchReport();
+  assert_equals(report["body"]["blocked-url"], image_url.toString());
+  assert_equals(report["body"]["type"], "corp");
+  assert_equals(report["type"], "coep");
+  assert_equals(normalize(report["url"]), normalize(worker_url.toString()));
+}, "COEP support on ServiceWorker.")
+
+promise_test(async (t) => {
+  const worker_url =
+    local(encode(worker_path + header_coep_report_only + header_service_worker_allowed))
+  const reg =
+    await service_worker_unregister_and_register(t, worker_url, SW_SCOPE);
+  add_completion_callback(() => reg.unregister());
+  const worker = reg.installing || reg.waiting || reg.active;
+  worker.postMessage(eval_script);
+  const report = await fetchReport();
+  assert_equals(report["body"]["blocked-url"], image_url.toString());
+  assert_equals(report["body"]["type"], "corp");
+  assert_equals(report["type"], "coep");
+  assert_equals(normalize(report["url"]), normalize(worker_url.toString()));
+}, "COEP-Report-Only support on ServiceWorker.")
+
+</script>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting.https.html
index bb0a6a2b0a8..95fe047ea9f 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/reporting.https.html
@@ -1,11 +1,12 @@
 <!doctype html>
 <html>
-<html>
+<meta name="timeout" content="long">
 <body>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/common/utils.js"></script>
 <script src="/common/get-host-info.sub.js"></script>
+<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <script>
 const HOST = get_host_info();
 const REMOTE_ORIGIN = HOST.REMOTE_ORIGIN;
@@ -28,8 +29,8 @@ async function pollReports(endpoint, reports) {
   }
 }
 
-let reports = []
-let reportsForReportOnly = []
+const reports = [];
+const reportsForReportOnly = [];
 pollReports('endpoint', reports);
 pollReports('report-only-endpoint', reportsForReportOnly);
 
@@ -48,6 +49,21 @@ function checkCorpReportExistence(reports, blockedUrl, contextUrl) {
   assert_unreached(`A report whose blocked-url is ${blockedUrl} and url is ${contextUrl} is not found.`);
 }
 
+function checkNavigationReportExistence(reports, blockedUrl, contextUrl) {
+  blockedUrl = new URL(blockedUrl, location).href;
+  contextUrl = new URL(contextUrl, location).href;
+  for (const report of reports) {
+    if (report.type !== 'coep' || report.url !== contextUrl ||
+        report.body.type !== 'navigation') {
+      continue;
+    }
+    if (report.body['blocked-url'] === blockedUrl) {
+      return;
+    }
+  }
+  assert_unreached(`A report whose blocked-url is ${blockedUrl} and url is ${contextUrl} is not found.`);
+}
+
 function checkReportNonExistence(reports, blockedUrl, contextUrl) {
   blockedUrl = new URL(blockedUrl, location).href;
   contextUrl = new URL(contextUrl, location).href;
@@ -87,7 +103,8 @@ async_test(async (t) => {
     fetchInIframe(blockedDueToCoep);
     fetchInIframe(redirect);
 
-    await new Promise(resolve => t.step_timeout(resolve, 3000));
+    // Wait 3 seconds for reports to settle.
+    await wait(3000);
 
     checkReportNonExistence(reports, sameOriginUrl, iframe.src);
     checkReportNonExistence(reports, blockedByPureCorp, iframe.src);
@@ -101,6 +118,68 @@ async_test(async (t) => {
   }
 }, 'subresource CORP');
 
+async_test(async (t) => {
+  try {
+    const IFRAME_SRC = 'resources/coep-iframe.html';
+    const SCOPE = new URL(IFRAME_SRC, location).pathname;
+    const SCRIPT =
+      'resources/sw.js?' +
+      `pipe=header(service-worker-allowed,${SCOPE})|` +
+      'header(cross-origin-embedder-policy,require-corp%3breport-to=%22endpoint%22)|' +
+      'header(cross-origin-embedder-policy-report-only,require-corp%3breport-to=%22report-only-endpoint%22)';
+
+    const reg = await service_worker_unregister_and_register(t, SCRIPT, SCOPE);
+    await wait_for_state(t, reg.installing, 'activated');
+
+    const iframe = document.createElement('iframe');
+    t.add_cleanup(() => {
+      iframe.remove();
+      reg.unregister();
+    });
+    iframe.src = IFRAME_SRC;
+    document.body.appendChild(iframe);
+    await new Promise(resolve => {
+      iframe.addEventListener('load', resolve, {once: true});
+    });
+
+    document.body.appendChild(iframe);
+    await new Promise(resolve => {
+      iframe.addEventListener('load', resolve, {once: true});
+    });
+
+    function fetchInIframe(url) {
+      const init = { mode: 'no-cors', cache: 'no-store' };
+      iframe.contentWindow.fetch(url, init).catch(() => {});
+    }
+
+    const suffix = 'subresource-corp-sw';
+    const sameOriginUrl = `/common/text-plain.txt?${suffix}`;
+    const blockedByPureCorp = `${REMOTE_ORIGIN}${BASE}/nothing-same-origin-corp.txt?${suffix}`;
+    const blockedDueToCoep = `${REMOTE_ORIGIN}/common/text-plain.txt?abc&${suffix}`;
+    const dest = `${REMOTE_ORIGIN}/common/text-plain.txt?xyz&${suffix}`;
+    const redirect = `/common/redirect.py?location=${encodeURIComponent(dest)}&${suffix}`;
+
+    fetchInIframe(sameOriginUrl);
+    fetchInIframe(blockedByPureCorp);
+    fetchInIframe(blockedDueToCoep);
+    fetchInIframe(redirect);
+
+    // Wait 3 seconds for reports to settle.
+    await wait(3000);
+
+    const contextUrl = SCRIPT;
+    checkReportNonExistence(reports, sameOriginUrl, contextUrl);
+    checkReportNonExistence(reports, blockedByPureCorp, contextUrl);
+    checkCorpReportExistence(reports, blockedDueToCoep, contextUrl);
+    checkCorpReportExistence(reports, redirect, contextUrl);
+    checkReportNonExistence(reports, dest, contextUrl);
+
+    t.done();
+  } catch (e) {
+    t.step(() => { throw e });
+  }
+}, 'CORP for subresource requests initiated from a service worker');
+
 async_test(async (t) => {
   try {
     const iframe = document.createElement('iframe');
@@ -121,16 +200,18 @@ async_test(async (t) => {
     }
 
     const suffix = 'navigation-corp';
-    const sameOrigin = `/common/blank.html?${suffix}`;
-    const blockedDueToCoep = `${REMOTE_ORIGIN}/common/blank.html?abc&${suffix}`;
-    const dest = `${REMOTE_ORIGIN}/common/blank.html?xyz&${suffix}`;
+    const coep = `pipe=header(cross-origin-embedder-policy,require-corp)`;
+    const sameOrigin = `/common/blank.html?${coep}&${suffix}`;
+    const blockedDueToCoep = `${REMOTE_ORIGIN}/common/blank.html?${coep}&${suffix}-a`;
+    const dest = `${REMOTE_ORIGIN}/common/blank.html?${coep}&${suffix}-b`;
     const redirect = `/common/redirect.py?location=${encodeURIComponent(dest)}&${suffix}`;
 
     attachFrame(sameOrigin);
     attachFrame(blockedDueToCoep);
     attachFrame(redirect);
 
-    await new Promise(resolve => t.step_timeout(resolve, 3000));
+    // Wait 3 seconds for reports to settle.
+    await wait(3000);
 
     checkReportNonExistence(reports, sameOrigin, iframe.src);
     checkCorpReportExistence(reports, blockedDueToCoep, iframe.src);
@@ -143,4 +224,187 @@ async_test(async (t) => {
   }
 }, 'navigation CORP');
 
-</script>
+async_test(async (t) => {
+  try {
+    const iframe = document.createElement('iframe');
+    t.add_cleanup(() => iframe.remove());
+
+    const suffix = '&navigation-coep';
+    const corp = 'header(cross-origin-resource-policy,cross-origin)';
+    const noCoep = `pipe=${corp}`;
+    const coep =
+      `pipe=header(cross-origin-embedder-policy,require-corp%3breport-to=%22endpoint%22)|${corp}`;
+    const coepReportOnly =
+      `pipe=header(cross-origin-embedder-policy-report-only,require-corp%3breport-to=%22report-only-endpoint%22)|${corp}`;
+    const path = `/common/blank.html`;
+    const pipes = [noCoep, coep, coepReportOnly];
+    const settings = new Map();
+    settings.set(noCoep, {
+      pipe: noCoep,
+      value: 'unsafe-none',
+      reportOnlyValue: 'unsafe-none',
+    });
+    settings.set(coep, {
+      pipe: coep,
+      value: 'require-corp',
+      reportOnlyValue: 'unsafe-none',
+    });
+    settings.set(coepReportOnly, {
+      pipe: coepReportOnly,
+      value: 'unsafe-none',
+      reportOnlyValue: 'require-corp',
+    });
+
+    function genUrl(pipe) {
+      return `${path}?${pipe}${suffix}`;
+    }
+
+    for (const outer of settings.keys()) {
+      for (const inner of settings.keys()) {
+        const iframe = document.createElement('iframe');
+        t.add_cleanup(() => iframe.remove());
+
+        iframe.src = genUrl(outer);
+        iframe.addEventListener('load', () => {
+          const w = iframe.contentWindow;
+          const d = iframe.contentDocument;
+          const nested = d.createElement('iframe');
+          nested.src = genUrl(inner) + '-nested';
+          d.body.appendChild(nested);
+        }, {once: true});
+        document.body.appendChild(iframe);
+      }
+    }
+
+    // Wait 3 seconds for reports to settle.
+    await wait(3000);
+
+    function check(rs, inner, outer) {
+      checkNavigationReportExistence(
+        rs, genUrl(inner) + '-nested', genUrl(outer));
+    }
+    function checkNoReport(reports, inner, outer) {
+      checkReportNonExistence(
+        reports, genUrl(inner) + '-nested', genUrl(outer));
+    }
+
+    // outer === noCoep
+    checkNoReport(reports, noCoep, noCoep);
+    checkNoReport(reports, coep, noCoep);
+    checkNoReport(reports, coepReportOnly, noCoep);
+    checkNoReport(reportsForReportOnly, noCoep, noCoep);
+    checkNoReport(reportsForReportOnly, coep, noCoep);
+    checkNoReport(reportsForReportOnly, coepReportOnly, noCoep);
+
+    // outer === coep
+    check(reports, noCoep, coep);
+    checkNoReport(reports, coep, coep);
+    check(reports, coepReportOnly, coep);
+    checkNoReport(reportsForReportOnly, noCoep, coep);
+    checkNoReport(reportsForReportOnly, coep, coep);
+    checkNoReport(reportsForReportOnly, coepReportOnly, coep);
+
+    // outer === coepReportOnly
+    checkNoReport(reports, noCoep, coepReportOnly);
+    checkNoReport(reports, coep, coepReportOnly);
+    checkNoReport(reports, coepReportOnly, coepReportOnly);
+    check(reportsForReportOnly, noCoep, coepReportOnly);
+    checkNoReport(reportsForReportOnly, coep, coepReportOnly);
+    check(reportsForReportOnly, coepReportOnly, coepReportOnly);
+
+    t.done();
+  } catch (e) {
+    t.step(() => { throw e });
+  }
+}, 'COEP violation on nested frame navigation');
+
+promise_test(async (t) => {
+  const iframe_src = `resources/reporting-empty-frame.html?passthrough`;
+  // Register a service worker that controls an iframe.
+  const registration = await service_worker_unregister_and_register(
+      t, 'resources/sw.js', iframe_src);
+  t.add_cleanup(() => registration.unregister());
+  await wait_for_state(t, registration.installing, 'activated');
+
+  const iframe = document.createElement('iframe');
+  t.add_cleanup(() => iframe.remove());
+
+  iframe.src = iframe_src;
+  document.body.appendChild(iframe);
+  await new Promise(resolve => {
+    iframe.addEventListener('load', resolve, {once: true});
+  });
+
+  async function fetchInIframe(url) {
+    const init = { mode: 'no-cors', cache: 'no-store' };
+    // Ignore errors.
+    return iframe.contentWindow.fetch(url, init).catch(() => {});
+  }
+
+  const suffix = 'subresource-corp-passthrough-sw';
+  const sameOriginUrl = `/common/text-plain.txt?${suffix}`;
+  const blockedByPureCorp = `${REMOTE_ORIGIN}${BASE}/nothing-same-origin-corp.txt?${suffix}`;
+  const blockedDueToCoep = `${REMOTE_ORIGIN}/common/text-plain.txt?abc&${suffix}`;
+  const dest = `${REMOTE_ORIGIN}/common/text-plain.txt?xyz&${suffix}`;
+  const redirect = `/common/redirect.py?location=${encodeURIComponent(dest)}&${suffix}`;
+
+  fetchInIframe(sameOriginUrl);
+  fetchInIframe(blockedByPureCorp);
+  fetchInIframe(blockedDueToCoep);
+  fetchInIframe(redirect);
+
+  // Wait until |reports| is ready.
+  await wait(1000);
+
+  checkReportNonExistence(reports, sameOriginUrl, iframe.src);
+  checkReportNonExistence(reports, blockedByPureCorp, iframe.src);
+  checkCorpReportExistence(reports, blockedDueToCoep, iframe.src);
+  checkCorpReportExistence(reports, redirect, iframe.src);
+  checkReportNonExistence(reports, dest, iframe.src);
+}, 'subresource CORP in a passthrough iframe hosted by a service worker without COEP');
+
+promise_test(async (t) => {
+  const iframe_src = `resources/reporting-empty-frame.html`;
+  // Register a service worker that controls an iframe.
+  const registration = await service_worker_unregister_and_register(
+      t, 'resources/sw.js', iframe_src);
+  t.add_cleanup(() => registration.unregister());
+  await wait_for_state(t, registration.installing, 'activated');
+
+  const iframe = document.createElement('iframe');
+  t.add_cleanup(() => iframe.remove());
+
+  iframe.src = iframe_src;
+  document.body.appendChild(iframe);
+  await new Promise(resolve => {
+    iframe.addEventListener('load', resolve, {once: true});
+  });
+
+  async function fetchInIframe(url) {
+    const init = { mode: 'no-cors', cache: 'no-store' };
+    // Ignore errors.
+    return iframe.contentWindow.fetch(url, init).catch(() => {});
+  }
+
+  const suffix = 'subresource-corp-respondwith-fetch-sw';
+  const sameOriginUrl = `/common/text-plain.txt?${suffix}`;
+  const blockedByPureCorp = `${REMOTE_ORIGIN}${BASE}/nothing-same-origin-corp.txt?${suffix}`;
+  const blockedDueToCoep = `${REMOTE_ORIGIN}/common/text-plain.txt?abc&${suffix}`;
+  const dest = `${REMOTE_ORIGIN}/common/text-plain.txt?xyz&${suffix}`;
+  const redirect = `/common/redirect.py?location=${encodeURIComponent(dest)}&${suffix}`;
+
+  fetchInIframe(sameOriginUrl);
+  fetchInIframe(blockedByPureCorp);
+  fetchInIframe(blockedDueToCoep)
+  fetchInIframe(redirect);
+
+  // Wait until |reports| is ready.
+  await wait(1000);
+
+  checkReportNonExistence(reports, sameOriginUrl, iframe.src);
+  checkReportNonExistence(reports, blockedByPureCorp, iframe.src);
+  checkCorpReportExistence(reports, blockedDueToCoep, iframe.src);
+  checkCorpReportExistence(reports, redirect, iframe.src);
+  checkReportNonExistence(reports, dest, iframe.src);
+}, 'subresource CORP in a respondWith(fetch) iframe hosted by a service worker without COEP');
+</script>$
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/report.py b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/report.py
index 17ca65cbf6b..1f628ca878d 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/report.py
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/resources/report.py
@@ -8,21 +8,23 @@ def main(request, response):
         response.headers.set('Access-Control-Allow-Methods', 'POST')
         response.headers.set('Access-Control-Allow-Headers', 'content-type')
         return ''
-
+    response.headers.set('Access-Control-Allow-Origin', '*')
     uuidMap = {
         'endpoint': '01234567-0123-0123-0123-0123456789AB',
         'report-only-endpoint': '01234567-0123-0123-0123-0123456789CD'
     }
+    key = 0;
+    if 'endpoint' in request.GET:
+        key = uuidMap[request.GET['endpoint']]
 
-    response.headers.set('Access-Control-Allow-Origin', '*')
-    endpoint = request.GET.first('endpoint')
-    if endpoint not in uuidMap:
+    if 'key' in request.GET:
+        key = request.GET['key']
+
+    if key == 0:
         response.status = 400
         return 'invalid endpoint'
 
     path = '/'.join(request.url_parts.path.split('/')[:-1]) + '/'
-    key = uuidMap[endpoint]
-
     if request.method == 'POST':
         reports = request.server.stash.take(key, path) or []
         for report in json.loads(request.body):
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html
index 635f7ab3b87..a38376c7fcf 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-same-origin.https.html
@@ -8,18 +8,21 @@
 
 <div id=log></div>
 <script>
+// This document has COOP "same-origin". The popup has COOP "same-origin". Therefore there should
+// only be an opener and name if the frameOrigin and popupOrigin are same-origin with this document.
 [
-[SAME_ORIGIN, SAME_ORIGIN, "same-origin", true, true],
-[SAME_SITE, SAME_ORIGIN, "same-origin", false, false],
-[CROSS_ORIGIN, SAME_ORIGIN, "same-origin", false, false],
-[SAME_ORIGIN, SAME_SITE, "same-origin", false, false],
-[SAME_SITE, SAME_SITE, "same-origin", false, false],
-[CROSS_ORIGIN, SAME_SITE, "same-origin", false, false],
-[SAME_ORIGIN, CROSS_ORIGIN, "same-origin", false, false],
-[SAME_SITE, CROSS_ORIGIN, "same-origin", false, false],
-[CROSS_ORIGIN, CROSS_ORIGIN, "same-origin", false, false],
-].forEach( value => {
-    run_coop_test_iframe("same-origin", value[0], value[1], value[2], value[3], value[4]);
+[SAME_ORIGIN, SAME_ORIGIN, true],
+[SAME_SITE, SAME_ORIGIN, false],
+[CROSS_ORIGIN, SAME_ORIGIN, false],
+[SAME_ORIGIN, SAME_SITE, false],
+[SAME_SITE, SAME_SITE, false],
+[CROSS_ORIGIN, SAME_SITE, false],
+[SAME_ORIGIN, CROSS_ORIGIN, false],
+[SAME_SITE, CROSS_ORIGIN, false],
+[CROSS_ORIGIN, CROSS_ORIGIN, false],
+].forEach(([frameOrigin, popupOrigin, popupHasOpenerAndName]) => {
+    const testTitleStart = "same-origin";
+    const popupCOOP = "same-origin";
+    run_coop_test_iframe(testTitleStart, frameOrigin, popupOrigin, popupCOOP, popupHasOpenerAndName, popupHasOpenerAndName);
 });
-
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-unsafe-none.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-unsafe-none.https.html
index 6589ad923c1..4adb4130418 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-unsafe-none.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/iframe-popup-same-origin-to-unsafe-none.https.html
@@ -8,18 +8,22 @@
 
 <div id=log></div>
 <script>
+// This document has COOP "same-origin". The popup has no COOP. Therefore there should be no
+// opener or name.
 [
-[SAME_ORIGIN, SAME_ORIGIN, "", false, false],
-[SAME_SITE, SAME_ORIGIN, "", false, true],
-[CROSS_ORIGIN, SAME_ORIGIN, "", false, true],
-[SAME_ORIGIN, SAME_SITE, "", false, false],
-[SAME_SITE, SAME_SITE, "", false, true],
-[CROSS_ORIGIN, SAME_SITE, "", false, true],
-[SAME_ORIGIN, CROSS_ORIGIN, "", false, false],
-[SAME_SITE, CROSS_ORIGIN, "", false, true],
-[CROSS_ORIGIN, CROSS_ORIGIN, "", false, true],
-].forEach( value => {
-    run_coop_test_iframe("same-origin", value[0], value[1], value[2], value[3], value[4]);
+[SAME_ORIGIN, SAME_ORIGIN],
+[SAME_SITE, SAME_ORIGIN],
+[CROSS_ORIGIN, SAME_ORIGIN],
+[SAME_ORIGIN, SAME_SITE],
+[SAME_SITE, SAME_SITE],
+[CROSS_ORIGIN, SAME_SITE],
+[SAME_ORIGIN, CROSS_ORIGIN],
+[SAME_SITE, CROSS_ORIGIN],
+[CROSS_ORIGIN, CROSS_ORIGIN],
+].forEach(([frameOrigin, popupOrigin]) => {
+    const testTitleStart = "same-origin";
+    const popupCOOP = "";
+    const popupHasOpenerAndName = false;
+    run_coop_test_iframe(testTitleStart, frameOrigin, popupOrigin, popupCOOP, popupHasOpenerAndName, popupHasOpenerAndName);
 });
-
 </script>
diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-lazy.tentative.html b/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-lazy.tentative.html
new file mode 100644
index 00000000000..c058aa426de
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/replaced-elements/attributes-for-embedded-content-and-images/img-aspect-ratio-lazy.tentative.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<title>Image width and height attributes are used to infer aspect-ratio for lazy-loaded images</title>
+<meta name="viewport" content="width=device-width">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  img {
+    width: 100%;
+    max-width: 100px;
+    height: auto;
+  }
+</style>
+<div style="height: 600vh"></div>
+<img src="/images/green.png" loading="lazy" width=100 height=100>
+<script>
+let t = async_test("Image width and height attributes are used to infer aspect-ratio for lazy-loaded images");
+
+function assert_ratio(img, expected) {
+  let epsilon = 0.001;
+  assert_approx_equals(parseFloat(getComputedStyle(img).width, 10) / parseFloat(getComputedStyle(img).height, 10), expected, epsilon);
+}
+
+t.step(function() {
+  let img = document.querySelector("img");
+  assert_ratio(img, 1.0);
+  img.addEventListener("load", t.step_func_done(function() {
+    assert_ratio(img, 2.0); // 2.0 is the original aspect ratio of green.png
+  }));
+  window.scrollTo(0, img.getBoundingClientRect().top);
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/html/user-activation/activation-hierarchy-parent-manual.sub.tentative.html b/tests/wpt/web-platform-tests/html/user-activation/activation-hierarchy-crossorigin-parent-manual.sub.html
similarity index 83%
rename from tests/wpt/web-platform-tests/html/user-activation/activation-hierarchy-parent-manual.sub.tentative.html
rename to tests/wpt/web-platform-tests/html/user-activation/activation-hierarchy-crossorigin-parent-manual.sub.html
index 7dd8018573d..601b9003f7e 100644
--- a/tests/wpt/web-platform-tests/html/user-activation/activation-hierarchy-parent-manual.sub.tentative.html
+++ b/tests/wpt/web-platform-tests/html/user-activation/activation-hierarchy-crossorigin-parent-manual.sub.html
@@ -1,8 +1,4 @@
 <!DOCTYPE html>
-<!--
-   Tentative due to:
-   https://github.com/whatwg/html/issues/1903
--->
 <html>
 <head>
 <script src="/resources/testharness.js"></script>
@@ -11,7 +7,8 @@
 <script src="/resources/testdriver-vendor.js"></script>
 </head>
 <body>
-  <h1>Activation state is visible in parent and not in child</h1>
+  <h1>User activation visibility across cross-origin frame boundary</h1>
+  <h2>Confirms that the state is visible in parent and not in child</h2>
   <ol id="instructions">
     <li>Click anywhere on the green area (child frame).
   </ol>
@@ -31,7 +28,7 @@
                 t.done();
             }
         }));
-        child.src = "http://{{domains[www1]}}:{{ports[http][0]}}/html/user-activation/resources/activation-hierarchy-child.sub.html";
+        child.src = "http://{{domains[www1]}}:{{ports[http][0]}}/html/user-activation/resources/activation-hierarchy-crossorigin-child.sub.html";
     }, "Parent test");
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/html/user-activation/activation-hierarchy-sameorigin-parent-manual.html b/tests/wpt/web-platform-tests/html/user-activation/activation-hierarchy-sameorigin-parent-manual.html
new file mode 100644
index 00000000000..a7f423eea56
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/user-activation/activation-hierarchy-sameorigin-parent-manual.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+<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>
+</head>
+<body>
+  <h1>User activation visibility across same-origin frame boundary</h1>
+  <h2>Confirms that the state is visible in both parent and child</h2>
+  <ol id="instructions">
+    <li>Click anywhere on the green area (child frame).
+  </ol>
+  <iframe id="child" width="400" height="400"></iframe>
+  <script>
+    async_test(function(t) {
+        assert_false(navigator.userActivation.isActive);
+        assert_false(navigator.userActivation.hasBeenActive);
+
+        let child = document.getElementById("child");
+
+        window.addEventListener("message", t.step_func(event => {
+            if (event.source === frames[0].frames[0] && event.data === 'checked') {
+                // Parent should be active after child is clicked.
+                assert_true(navigator.userActivation.isActive);
+                assert_true(navigator.userActivation.hasBeenActive);
+                t.done();
+            }
+        }));
+        child.src = "resources/activation-hierarchy-sameorigin-child.html";
+    }, "Parent test");
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/user-activation/resources/activation-hierarchy-child.sub.html b/tests/wpt/web-platform-tests/html/user-activation/resources/activation-hierarchy-crossorigin-child.sub.html
similarity index 92%
rename from tests/wpt/web-platform-tests/html/user-activation/resources/activation-hierarchy-child.sub.html
rename to tests/wpt/web-platform-tests/html/user-activation/resources/activation-hierarchy-crossorigin-child.sub.html
index ebccc8c0dbf..6dbd4683044 100644
--- a/tests/wpt/web-platform-tests/html/user-activation/resources/activation-hierarchy-child.sub.html
+++ b/tests/wpt/web-platform-tests/html/user-activation/resources/activation-hierarchy-crossorigin-child.sub.html
@@ -25,7 +25,7 @@
             t.done();
         }));
 
-        grandchild.src = "http://{{domains[www2]}}:{{ports[http][0]}}/html/user-activation/resources/activation-hierarchy-grandchild.html";
+        grandchild.src = "http://{{domains[www2]}}:{{ports[http][0]}}/html/user-activation/resources/activation-hierarchy-crossorigin-grandchild.html";
     }, "Child test");
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/html/user-activation/resources/activation-hierarchy-grandchild.html b/tests/wpt/web-platform-tests/html/user-activation/resources/activation-hierarchy-crossorigin-grandchild.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/user-activation/resources/activation-hierarchy-grandchild.html
rename to tests/wpt/web-platform-tests/html/user-activation/resources/activation-hierarchy-crossorigin-grandchild.html
diff --git a/tests/wpt/web-platform-tests/html/user-activation/resources/activation-hierarchy-sameorigin-child.html b/tests/wpt/web-platform-tests/html/user-activation/resources/activation-hierarchy-sameorigin-child.html
new file mode 100644
index 00000000000..d54c7efc9bd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/user-activation/resources/activation-hierarchy-sameorigin-child.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body style="background: lightgreen;">
+  <h1>Child frame</h1>
+  <iframe id="grandchild" width="350" height="200"></iframe>
+  <script>
+    async_test(function(t) {
+        assert_false(navigator.userActivation.isActive);
+        assert_false(navigator.userActivation.hasBeenActive);
+
+        var grandchild = document.getElementById("grandchild");
+
+        window.addEventListener("click", t.step_func(event => {
+            // Child should be active when clicked.
+            assert_true(navigator.userActivation.isActive);
+            assert_true(navigator.userActivation.hasBeenActive);
+
+            // Ask grandchild to check its state (and notify top frame).
+            grandchild.contentWindow.postMessage('check-request', '*');
+
+            t.done();
+        }));
+
+        grandchild.src = "activation-hierarchy-sameorigin-grandchild.html";
+    }, "Child test");
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/user-activation/resources/activation-hierarchy-sameorigin-grandchild.html b/tests/wpt/web-platform-tests/html/user-activation/resources/activation-hierarchy-sameorigin-grandchild.html
new file mode 100644
index 00000000000..9d664e2356a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/user-activation/resources/activation-hierarchy-sameorigin-grandchild.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body style="background: lightgrey;">
+  <h1>Grandchild frame</h1>
+  <script>
+    async_test(function(t) {
+        assert_false(navigator.userActivation.isActive);
+        assert_false(navigator.userActivation.hasBeenActive);
+
+        window.addEventListener("message", event => {
+            if (event.source === parent && event.data === 'check-request') {
+                // Grandchild shouldn't be active after child is clicked.
+                assert_true(navigator.userActivation.isActive);
+                assert_true(navigator.userActivation.hasBeenActive);
+
+                // Notify top frame that checks are done.
+                parent.parent.postMessage('checked', '*');
+
+                t.done();
+            }
+        });
+
+    }, "Grandchild test");
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.html b/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.html
index 4c83c7e8a54..0fb9e372b0d 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.html
+++ b/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/navigator_user_agent.https.html
@@ -5,7 +5,7 @@
 <script>
   test(t => {
     assert_true("userAgentData" in navigator);
-  }, "navigator.getUserAgent() is exposed.");
+  }, "navigator.userAgentData is exposed.");
 
   promise_test(async t => {
     const uaData = navigator.userAgentData;
@@ -24,5 +24,5 @@
     assert_equals(highEntropyData2["platformVersion"], "", "Platform version should be an empty string");
     assert_equals(highEntropyData2["architecture"], "", "Architecture should be an empty string");
     assert_equals(highEntropyData2["model"], "", "Model should be an empty string");
-  }, "navigator.getUserAgent() returns a UserAgentMetadata object.");
+  }, "navigator.userAgentData returns a UserAgentMetadata object.");
 </script>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/@std/__dir__.headers b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/@std/__dir__.headers
deleted file mode 100644
index e7ec0d6699d..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/@std/__dir__.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/javascript
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/@std/blank b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/@std/blank
deleted file mode 100644
index 38e1891bf7d..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/@std/blank
+++ /dev/null
@@ -1 +0,0 @@
-log.push("relative:@std/blank");
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/@std/none b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/@std/none
deleted file mode 100644
index 69e165cce5e..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/@std/none
+++ /dev/null
@@ -1 +0,0 @@
-log.push("relative:@std/none");
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare.sub.tentative.html b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare.sub.tentative.html
deleted file mode 100644
index e20424aed8a..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare.sub.tentative.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/test-helper.js"></script>
-
-<script>
-// "bare/..." (i.e. without leading "./") are bare specifiers
-// (not relative paths).
-//
-// Discussions about notations for builtin modules are ongoing, e.g.
-// https://github.com/tc39/proposal-javascript-standard-library/issues/12
-// Currently the tests expects two notations are accepted.
-// TODO: Once the discussions converge, update the tests.
-const importMap = `
-{
-  "imports": {
-    "bare/std-blank": "std:blank",
-    "bare/blank": "@std/blank",
-    "bare/std-none": "std:none",
-    "bare/none": "@std/none"
-  }
-}
-`;
-
-const tests = {
-  // Arrays of expected results for:
-  // - <script src type="module">,
-  // - <script src> (classic script),
-  // - static import, and
-  // - dynamic import.
-
-  // Currently, Chromium's implementation resolves import maps as a part of
-  // specifier resolution, and thus failure in import map resolution causes
-  // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR
-  // below. https://crbug.com/928435
-
-  // Bare to built-in.
-  "bare/std-blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "bare/blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "bare/std-none":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-  "bare/none":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-};
-
-doTests(importMap, null, tests);
-</script>
-<body>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare/__dir__.headers b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare/__dir__.headers
deleted file mode 100644
index e7ec0d6699d..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare/__dir__.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Type: text/javascript
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare/blank b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare/blank
deleted file mode 100644
index 841d433acf7..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare/blank
+++ /dev/null
@@ -1 +0,0 @@
-log.push("relative:bare/blank");
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare/none b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare/none
deleted file mode 100644
index 2aec0d72826..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare/none
+++ /dev/null
@@ -1 +0,0 @@
-log.push("relative:bare/none");
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare/std-blank b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare/std-blank
deleted file mode 100644
index 5ded98fd382..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare/std-blank
+++ /dev/null
@@ -1 +0,0 @@
-log.push("relative:bare/std-blank");
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare/std-none b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare/std-none
deleted file mode 100644
index 1437d9ff1e0..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/bare/std-none
+++ /dev/null
@@ -1 +0,0 @@
-log.push("relative:bare/std-none");
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/builtin-empty.tentative.html b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/builtin-empty.tentative.html
deleted file mode 100644
index 9ede75a4c42..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/builtin-empty.tentative.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/test-helper.js"></script>
-
-<script>
-const importMap = `
-{
-  "imports": {
-    "../resources/log.js?pipe=sub&name=empty": [ "@std/" ],
-    "../resources/log.js?pipe=sub&name=empty-fallback": [
-      "@std/",
-      "../resources/log.js?pipe=sub&name=empty-fallback"
-    ]
-  }
-}
-`;
-
-const tests = {
-  // Arrays of expected results for:
-  // - <script src type="module">,
-  // - <script src> (classic script),
-  // - static import, and
-  // - dynamic import.
-
-  // Discussions about notations are ongoing, e.g.
-  // https://github.com/tc39/proposal-javascript-standard-library/issues/12
-  // Currently the tests expects two notations are accepted.
-  // TODO: Once the discussions converge, update this and related tests.
-  "std:":
-    [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR],
-  "@std/":
-    [Result.FETCH_ERROR, Result.PARSE_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR],
-
-  "../resources/log.js?pipe=sub&name=empty":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-  "../resources/log.js?pipe=sub&name=empty-fallback":
-    [Result.URL, Result.URL, Result.URL, Result.URL],
-};
-
-doTests(importMap, null, tests);
-</script>
-<body>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/builtin-import-scheme.tentative.html b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/builtin-import-scheme.tentative.html
deleted file mode 100644
index d9977ae3535..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/builtin-import-scheme.tentative.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/test-helper.js"></script>
-
-<script>
-const tests = {
-  // Arrays of expected results for:
-  // - <script src type="module">,
-  // - <script src> (classic script),
-  // - static import, and
-  // - dynamic import.
-
-  // Currently direct use of import: URLs are disabled.
-  "import:std:blank":
-    [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR],
-  "import:@std/blank":
-    [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR],
-  "import:std:none":
-    [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR],
-  "import:@std/none":
-    [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR],
-};
-
-doTests(null, null, tests);
-</script>
-<body>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/builtin.tentative.html b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/builtin.tentative.html
deleted file mode 100644
index 497bb5c606b..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/builtin.tentative.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/test-helper.js"></script>
-
-<script>
-const tests = {
-  // Arrays of expected results for:
-  // - <script src type="module">,
-  // - <script src> (classic script),
-  // - static import, and
-  // - dynamic import.
-
-  // Discussions about notations are ongoing, e.g.
-  // https://github.com/tc39/proposal-javascript-standard-library/issues/12
-  // Currently the tests expects two notations are accepted.
-  // TODO: Once the discussions converge, update this and related tests.
-  "std:blank":
-    [Result.BUILTIN, Result.FETCH_ERROR, Result.BUILTIN, Result.BUILTIN],
-  "@std/blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "std:none":
-    [Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR, Result.FETCH_ERROR],
-  "@std/none":
-    [Result.URL, Result.URL, Result.FETCH_ERROR, Result.FETCH_ERROR],
-};
-
-doTests(null, null, tests);
-</script>
-<body>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/data.sub.tentative.html b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/data.sub.tentative.html
deleted file mode 100644
index 0377a788491..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/data.sub.tentative.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!DOCTYPE html>
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/test-helper.js"></script>
-
-<script>
-// "bare/..." (i.e. without leading "./") are bare specifiers
-// (not relative paths).
-//
-// Discussions about notations for builtin modules are ongoing, e.g.
-// https://github.com/tc39/proposal-javascript-standard-library/issues/12
-// Currently the tests expects two notations are accepted.
-// TODO: Once the discussions converge, update the tests.
-const importMap = `
-{
-  "imports": {
-    "data:text/javascript,log.push('data:std-blank')": "std:blank",
-    "data:text/javascript,log.push('data:blank')": "@std/blank",
-    "data:text/javascript,log.push('data:std-none')": "std:none",
-    "data:text/javascript,log.push('data:none')": "@std/none"
-  }
-}
-`;
-
-const tests = {
-  // Arrays of expected results for:
-  // - <script src type="module">,
-  // - <script src> (classic script),
-  // - static import, and
-  // - dynamic import.
-
-  // Currently, Chromium's implementation resolves import maps as a part of
-  // specifier resolution, and thus failure in import map resolution causes
-  // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR
-  // below. https://crbug.com/928435
-
-  // data: to built-in.
-  "data:text/javascript,log.push('data:std-blank')":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "data:text/javascript,log.push('data:blank')":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "data:text/javascript,log.push('data:std-none')":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-  "data:text/javascript,log.push('data:none')":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-};
-
-doTests(importMap, null, tests);
-</script>
-<body>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/fallback-disallowed.sub.tentative.html b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/fallback-disallowed.sub.tentative.html
deleted file mode 100644
index 7efe90eb751..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/fallback-disallowed.sub.tentative.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<!DOCTYPE html>
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/test-helper.js"></script>
-
-<script>
-// Fallbacks from external URLs (such as HTTPS URLs) are
-// blocked by ongoing spec discussions, for example
-// https://github.com/WICG/import-maps/issues/76.
-// https://crbug.com/928435
-//
-// This test, as well as Chromium's implementation, rejects broader range of
-// fallbacks (not only those from HTTPS), to avoid potential spec and
-// interoperability issues.
-// The only allowed fallback pattern is fallbacks from bare specifiers with
-// two elements, which are listed in fallback.sub.tentative.html.
-const importMap = `
-{
-  "imports": {
-    "bare": "../resources/log.js?pipe=sub&name=bare",
-
-    "../resources/log.js?pipe=sub&name=http-to-builtin": [
-      "../resources/log.js?pipe=sub&name=http-to-builtin",
-      "@std/blank"
-    ],
-
-    "../resources/log.js?pipe=sub&name=fallback-to-different-url-1": [
-      "@std/blank",
-      "../resources/log.js?pipe=sub&name=something-different"
-    ],
-    "../resources/log.js?pipe=sub&name=fallback-to-different-url-2": [
-      "@std/none",
-      "../resources/log.js?pipe=sub&name=something-different2"
-    ],
-    "../resources/log.js?pipe=sub&name=fallback-to-different-origin-1": [
-      "@std/blank",
-      "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=fallback-to-different-origin-1"
-    ],
-    "../resources/log.js?pipe=sub&name=fallback-to-different-origin-2": [
-      "@std/none",
-      "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=fallback-to-different-origin-2"
-    ],
-
-    "../resources/log.js?pipe=sub&name=more-than-two-values-1": [
-      "@std/none",
-      "@std/blank",
-      "../resources/log.js?pipe=sub&name=more-than-two-values-1"
-    ],
-    "../resources/log.js?pipe=sub&name=more-than-two-values-2": [
-      "@std/none",
-      "../resources/log.js?pipe=sub&name=more-than-two-values-2",
-      "@std/blank"
-    ],
-    "../resources/log.js?pipe=sub&name=fallback-from-http": [
-      "../resources/log.js?pipe=sub&name=non-built-in",
-      "../resources/log.js?pipe=sub&name=fallback-from-http"
-    ],
-    "../resources/log.js?pipe=sub&name=fallback-from-data-1": [
-      "data:text/plain,",
-      "../resources/log.js?pipe=sub&name=fallback-from-http"
-    ],
-    "../resources/log.js?pipe=sub&name=fallback-from-data-2": [
-      "data:text/javascript,log.push('dataURL')",
-      "../resources/log.js?pipe=sub&name=fallback-from-http"
-    ]
-  }
-}
-`;
-const tests = {};
-for (const key in JSON.parse(importMap).imports) {
-  if (key === "bare") {
-    continue;
-  }
-  tests[key] =
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR];
-}
-doTests(importMap, null, tests);
-</script>
-<body>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/fallback.sub.tentative.html b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/fallback.sub.tentative.html
deleted file mode 100644
index 45cf6dc1ced..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/fallback.sub.tentative.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!DOCTYPE html>
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/test-helper.js"></script>
-
-<script>
-// This tests is for fallbacks with the pattern of
-// `"https://some.external/url": ["@std/x", "https://some.external/url"]`
-// which maps "https://some.external/url" to "@std/x" if "@std/x" is
-// implemented, or leaves it unmodified otherwise.
-//
-// This is the primary use case where fallback should work.
-// Some other patterns of fallbacks are intentionally blocked due to ongoing
-// spec issues. See fallback-disallowed.sub.tentative.html.
-const importMap = `
-{
-  "imports": {
-    "../resources/log.js?pipe=sub&name=blank": [
-      "@std/blank",
-      "../resources/log.js?pipe=sub&name=blank"
-    ],
-    "../resources/log.js?pipe=sub&name=none": [
-      "@std/none",
-      "../resources/log.js?pipe=sub&name=none"
-    ],
-    "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-blank": [
-      "@std/blank",
-      "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-blank"
-    ],
-    "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-none": [
-      "@std/none",
-      "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-none"
-    ],
-
-    "../resources/log.js?pipe=sub&name=std-blank": [
-      "std:blank",
-      "../resources/log.js?pipe=sub&name=std-blank"
-    ],
-    "../resources/log.js?pipe=sub&name=std-none": [
-      "std:none",
-      "../resources/log.js?pipe=sub&name=std-none"
-    ],
-    "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-blank": [
-      "std:blank",
-      "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-blank"
-    ],
-    "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-none": [
-      "std:none",
-      "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-none"
-    ]
-
-  }
-}
-`;
-const tests = {
-  // Arrays of expected results for:
-  // - <script src type="module">,
-  // - <script src> (classic script),
-  // - static import, and
-  // - dynamic import.
-  // Result.URL indicates that the specifier was not re-mapped by import maps,
-  // i.e. either considered as a relative path, or fallback occured.
-  "../resources/log.js?pipe=sub&name=blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "../resources/log.js?pipe=sub&name=none":
-    [Result.URL, Result.URL, Result.URL, Result.URL],
-  "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-none":
-    [Result.URL, Result.URL, Result.URL, Result.URL],
-
-  "../resources/log.js?pipe=sub&name=std-blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "../resources/log.js?pipe=sub&name=std-none":
-    [Result.URL, Result.URL, Result.URL, Result.URL],
-  "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=std-cross-origin-none":
-    [Result.URL, Result.URL, Result.URL, Result.URL],
-};
-
-doTests(importMap, null, tests);
-</script>
-<body>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/http.sub.tentative.html b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/http.sub.tentative.html
deleted file mode 100644
index 7689ae13bb5..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/http.sub.tentative.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<!DOCTYPE html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../resources/test-helper.js"></script>
-
-<script>
-// "bare/..." (i.e. without leading "./") are bare specifiers
-// (not relative paths).
-//
-// Discussions about notations for builtin modules are ongoing, e.g.
-// https://github.com/tc39/proposal-javascript-standard-library/issues/12
-// Currently the tests expects two notations are accepted.
-// TODO: Once the discussions converge, update the tests.
-const importMap = `
-{
-  "imports": {
-    "../resources/log.js?pipe=sub&name=std-blank": "std:blank",
-    "../resources/log.js?pipe=sub&name=blank": "@std/blank",
-    "../resources/log.js?pipe=sub&name=std-none": "std:none",
-    "../resources/log.js?pipe=sub&name=none": "@std/none"
-  }
-}
-`;
-
-const tests = {
-  // Arrays of expected results for:
-  // - <script src type="module">,
-  // - <script src> (classic script),
-  // - static import, and
-  // - dynamic import.
-
-  // Currently, Chromium's implementation resolves import maps as a part of
-  // specifier resolution, and thus failure in import map resolution causes
-  // a parse error, not fetch error. Therefore, we use Result.PARSE_ERROR
-  // below. https://crbug.com/928435
-
-  // HTTP(S) to built-in.
-  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=std-blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=blank":
-    [Result.URL, Result.URL, Result.BUILTIN, Result.BUILTIN],
-  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=std-none":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-  "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=none":
-    [Result.URL, Result.URL, Result.PARSE_ERROR, Result.PARSE_ERROR],
-};
-
-doTests(importMap, null, tests);
-</script>
-<body>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/parsing-addresses.tentative.html b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/parsing-addresses.tentative.html
deleted file mode 100644
index 0cc92ce3e5e..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/parsing-addresses.tentative.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../resources/jest-test-helper.js"></script>
-<script type="module" src="resources/helpers/parsing.js"></script>
-
-<!--
-Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/parsing-addresses.js
--->
-<script type="module" src="resources/parsing-addresses.js"></script>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/parsing-schema.tentative.html b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/parsing-schema.tentative.html
deleted file mode 100644
index 9e3bca2935b..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/parsing-schema.tentative.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../resources/jest-test-helper.js"></script>
-<script type="module" src="resources/helpers/parsing.js"></script>
-
-<!--
-Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/parsing-schema.js
--->
-<script type="module" src="resources/parsing-schema.js"></script>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/parsing-scope-keys.tentative.html b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/parsing-scope-keys.tentative.html
deleted file mode 100644
index be23c645d0b..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/parsing-scope-keys.tentative.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../resources/jest-test-helper.js"></script>
-<script type="module" src="resources/helpers/parsing.js"></script>
-
-<!--
-Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/parsing-scope-keys.js
--->
-<script type="module" src="resources/parsing-scope-keys.js"></script>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/parsing-specifier-keys.tentative.html b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/parsing-specifier-keys.tentative.html
deleted file mode 100644
index 7bc2d4799f1..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/parsing-specifier-keys.tentative.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../resources/jest-test-helper.js"></script>
-<script type="module" src="resources/helpers/parsing.js"></script>
-
-<!--
-Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/parsing-specifier-keys.js
--->
-<script type="module" src="resources/parsing-specifier-keys.js"></script>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resolving-builtins.tentative.html b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resolving-builtins.tentative.html
deleted file mode 100644
index 065cfa30964..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resolving-builtins.tentative.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../resources/jest-test-helper.js"></script>
-<script type="module" src="resources/helpers/parsing.js"></script>
-
-<!--
-Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/resolving-builtins.js
--->
-<script type="module" src="resources/resolving-builtins.js"></script>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resolving-not-yet-implemented.tentative.html b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resolving-not-yet-implemented.tentative.html
deleted file mode 100644
index 3bdd591fd0c..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resolving-not-yet-implemented.tentative.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../resources/jest-test-helper.js"></script>
-<script type="module" src="resources/helpers/parsing.js"></script>
-
-<!--
-Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/resolving-not-yet-implemented.js
--->
-<script type="module" src="resources/resolving-not-yet-implemented.js"></script>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resolving-scopes.tentative.html b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resolving-scopes.tentative.html
deleted file mode 100644
index 33b49352ccd..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resolving-scopes.tentative.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../resources/jest-test-helper.js"></script>
-<script type="module" src="resources/helpers/parsing.js"></script>
-
-<!--
-Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/resolving-scopes.js
--->
-<script type="module" src="resources/resolving-scopes.js"></script>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resolving.tentative.html b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resolving.tentative.html
deleted file mode 100644
index 1d24eb2031e..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resolving.tentative.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="../../resources/jest-test-helper.js"></script>
-<script type="module" src="resources/helpers/parsing.js"></script>
-
-<!--
-Imported from https://github.com/WICG/import-maps/blob/master/reference-implementation/__tests__/resolving.js
--->
-<script type="module" src="resources/resolving.js"></script>
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/helpers/parsing.js b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/helpers/parsing.js
deleted file mode 100644
index 3000f782a11..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/helpers/parsing.js
+++ /dev/null
@@ -1,44 +0,0 @@
-'use strict';
-const { parseFromString } = require('../../lib/parser.js');
-
-// Local modifications from upstream:
-// Currently warnings and scopes are not checked in expectSpecifierMap().
-exports.expectSpecifierMap = (input, baseURL, output, warnings = []) => {
-  expect(parseFromString(`{ "imports": ${input} }`, baseURL))
-    .toEqual({ imports: output, scopes: {} });
-};
-
-exports.expectScopes = (inputArray, baseURL, outputArray, warnings = []) => {
-  const checkWarnings = testWarningHandler(warnings);
-
-  const inputScopesAsStrings = inputArray.map(scopePrefix => `${JSON.stringify(scopePrefix)}: {}`);
-  const inputString = `{ "scopes": { ${inputScopesAsStrings.join(', ')} } }`;
-
-  const outputScopesObject = {};
-  for (const outputScopePrefix of outputArray) {
-    outputScopesObject[outputScopePrefix] = {};
-  }
-
-  expect(parseFromString(inputString, baseURL)).toEqual({ imports: {}, scopes: outputScopesObject });
-
-  checkWarnings();
-};
-
-exports.expectBad = (input, baseURL, warnings = []) => {
-  const checkWarnings = testWarningHandler(warnings);
-  expect(parseFromString(input, baseURL)).toThrow('TypeError');
-  checkWarnings();
-};
-
-exports.expectWarnings = (input, baseURL, output, warnings = []) => {
-  const checkWarnings = testWarningHandler(warnings);
-  expect(parseFromString(input, baseURL)).toEqual(output);
-
-  checkWarnings();
-};
-
-function testWarningHandler(expectedWarnings) {
-  // We don't check warnings on WPT tests, because there are no
-  // ways to catch console warnings from JavaScript.
-  return () => {};
-}
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/parsing-addresses.js b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/parsing-addresses.js
deleted file mode 100644
index 0f5fc73506b..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/parsing-addresses.js
+++ /dev/null
@@ -1,351 +0,0 @@
-'use strict';
-const { expectSpecifierMap } = require('./helpers/parsing.js');
-const { BUILT_IN_MODULE_SCHEME } = require('../lib/utils.js');
-
-describe('Relative URL-like addresses', () => {
-  it('should accept strings prefixed with ./, ../, or /', () => {
-    expectSpecifierMap(
-      `{
-        "dotSlash": "./foo",
-        "dotDotSlash": "../foo",
-        "slash": "/foo"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        dotSlash: [expect.toMatchURL('https://base.example/path1/path2/foo')],
-        dotDotSlash: [expect.toMatchURL('https://base.example/path1/foo')],
-        slash: [expect.toMatchURL('https://base.example/foo')]
-      }
-    );
-  });
-
-  it('should not accept strings prefixed with ./, ../, or / for data: base URLs', () => {
-    expectSpecifierMap(
-      `{
-        "dotSlash": "./foo",
-        "dotDotSlash": "../foo",
-        "slash": "/foo"
-      }`,
-      'data:text/html,test',
-      {
-        dotSlash: [],
-        dotDotSlash: [],
-        slash: []
-      },
-      [
-        `Invalid address "./foo" for the specifier key "dotSlash".`,
-        `Invalid address "../foo" for the specifier key "dotDotSlash".`,
-        `Invalid address "/foo" for the specifier key "slash".`
-      ]
-    );
-  });
-
-  it('should accept the literal strings ./, ../, or / with no suffix', () => {
-    expectSpecifierMap(
-      `{
-        "dotSlash": "./",
-        "dotDotSlash": "../",
-        "slash": "/"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        dotSlash: [expect.toMatchURL('https://base.example/path1/path2/')],
-        dotDotSlash: [expect.toMatchURL('https://base.example/path1/')],
-        slash: [expect.toMatchURL('https://base.example/')]
-      }
-    );
-  });
-
-  it('should ignore percent-encoded variants of ./, ../, or /', () => {
-    expectSpecifierMap(
-      `{
-        "dotSlash1": "%2E/",
-        "dotDotSlash1": "%2E%2E/",
-        "dotSlash2": ".%2F",
-        "dotDotSlash2": "..%2F",
-        "slash2": "%2F",
-        "dotSlash3": "%2E%2F",
-        "dotDotSlash3": "%2E%2E%2F"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        dotSlash1: [],
-        dotDotSlash1: [],
-        dotSlash2: [],
-        dotDotSlash2: [],
-        slash2: [],
-        dotSlash3: [],
-        dotDotSlash3: []
-      },
-      [
-        `Invalid address "%2E/" for the specifier key "dotSlash1".`,
-        `Invalid address "%2E%2E/" for the specifier key "dotDotSlash1".`,
-        `Invalid address ".%2F" for the specifier key "dotSlash2".`,
-        `Invalid address "..%2F" for the specifier key "dotDotSlash2".`,
-        `Invalid address "%2F" for the specifier key "slash2".`,
-        `Invalid address "%2E%2F" for the specifier key "dotSlash3".`,
-        `Invalid address "%2E%2E%2F" for the specifier key "dotDotSlash3".`
-      ]
-    );
-  });
-});
-
-describe('Built-in module addresses', () => {
-  it('should accept URLs using the built-in module scheme', () => {
-    expectSpecifierMap(
-      `{
-        "foo": "${BUILT_IN_MODULE_SCHEME}:foo"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        foo: [expect.toMatchURL(`${BUILT_IN_MODULE_SCHEME}:foo`)]
-      }
-    );
-  });
-
-  it('should ignore percent-encoded variants of the built-in module scheme', () => {
-    expectSpecifierMap(
-      `{
-        "foo": "${encodeURIComponent(BUILT_IN_MODULE_SCHEME + ':')}foo"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        foo: []
-      },
-      [`Invalid address "${encodeURIComponent(BUILT_IN_MODULE_SCHEME + ':')}foo" for the specifier key "foo".`]
-    );
-  });
-
-  it('should allow built-in module URLs that contain "/" or "\\"', () => {
-    expectSpecifierMap(
-      `{
-        "slashEnd": "${BUILT_IN_MODULE_SCHEME}:foo/",
-        "slashMiddle": "${BUILT_IN_MODULE_SCHEME}:foo/bar",
-        "backslash": "${BUILT_IN_MODULE_SCHEME}:foo\\\\baz"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        slashEnd: [expect.toMatchURL(`${BUILT_IN_MODULE_SCHEME}:foo/`)],
-        slashMiddle: [expect.toMatchURL(`${BUILT_IN_MODULE_SCHEME}:foo/bar`)],
-        backslash: [expect.toMatchURL(`${BUILT_IN_MODULE_SCHEME}:foo\\baz`)]
-      }
-    );
-  });
-});
-
-describe('Absolute URL addresses', () => {
-  it('should only accept absolute URL addresses with fetch schemes', () => {
-    expectSpecifierMap(
-      `{
-        "about": "about:good",
-        "blob": "blob:good",
-        "data": "data:good",
-        "file": "file:///good",
-        "filesystem": "filesystem:good",
-        "http": "http://good/",
-        "https": "https://good/",
-        "ftp": "ftp://good/",
-        "import": "import:bad",
-        "mailto": "mailto:bad",
-        "javascript": "javascript:bad",
-        "wss": "wss:bad"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        about: [expect.toMatchURL('about:good')],
-        blob: [expect.toMatchURL('blob:good')],
-        data: [expect.toMatchURL('data:good')],
-        file: [expect.toMatchURL('file:///good')],
-        filesystem: [expect.toMatchURL('filesystem:good')],
-        http: [expect.toMatchURL('http://good/')],
-        https: [expect.toMatchURL('https://good/')],
-        ftp: [expect.toMatchURL('ftp://good/')],
-        import: [],
-        mailto: [],
-        javascript: [],
-        wss: []
-      },
-      [
-        `Invalid address "import:bad" for the specifier key "import".`,
-        `Invalid address "mailto:bad" for the specifier key "mailto".`,
-        `Invalid address "javascript:bad" for the specifier key "javascript".`,
-        `Invalid address "wss:bad" for the specifier key "wss".`
-      ]
-    );
-  });
-
-  it('should only accept absolute URL addresses with fetch schemes inside arrays', () => {
-    expectSpecifierMap(
-      `{
-        "about": ["about:good"],
-        "blob": ["blob:good"],
-        "data": ["data:good"],
-        "file": ["file:///good"],
-        "filesystem": ["filesystem:good"],
-        "http": ["http://good/"],
-        "https": ["https://good/"],
-        "ftp": ["ftp://good/"],
-        "import": ["import:bad"],
-        "mailto": ["mailto:bad"],
-        "javascript": ["javascript:bad"],
-        "wss": ["wss:bad"]
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        about: [expect.toMatchURL('about:good')],
-        blob: [expect.toMatchURL('blob:good')],
-        data: [expect.toMatchURL('data:good')],
-        file: [expect.toMatchURL('file:///good')],
-        filesystem: [expect.toMatchURL('filesystem:good')],
-        http: [expect.toMatchURL('http://good/')],
-        https: [expect.toMatchURL('https://good/')],
-        ftp: [expect.toMatchURL('ftp://good/')],
-        import: [],
-        mailto: [],
-        javascript: [],
-        wss: []
-      },
-      [
-        `Invalid address "import:bad" for the specifier key "import".`,
-        `Invalid address "mailto:bad" for the specifier key "mailto".`,
-        `Invalid address "javascript:bad" for the specifier key "javascript".`,
-        `Invalid address "wss:bad" for the specifier key "wss".`
-      ]
-    );
-  });
-
-  it('should parse absolute URLs, ignoring unparseable ones', () => {
-    expectSpecifierMap(
-      `{
-        "unparseable1": "https://ex ample.org/",
-        "unparseable2": "https://example.com:demo",
-        "unparseable3": "http://[www.example.com]/",
-        "invalidButParseable1": "https:example.org",
-        "invalidButParseable2": "https://///example.com///",
-        "prettyNormal": "https://example.net",
-        "percentDecoding": "https://ex%41mple.com/",
-        "noPercentDecoding": "https://example.com/%41"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        unparseable1: [],
-        unparseable2: [],
-        unparseable3: [],
-        invalidButParseable1: [expect.toMatchURL('https://example.org/')],
-        invalidButParseable2: [expect.toMatchURL('https://example.com///')],
-        prettyNormal: [expect.toMatchURL('https://example.net/')],
-        percentDecoding: [expect.toMatchURL('https://example.com/')],
-        noPercentDecoding: [expect.toMatchURL('https://example.com/%41')]
-      },
-      [
-        `Invalid address "https://ex ample.org/" for the specifier key "unparseable1".`,
-        `Invalid address "https://example.com:demo" for the specifier key "unparseable2".`,
-        `Invalid address "http://[www.example.com]/" for the specifier key "unparseable3".`
-      ]
-    );
-  });
-
-  it('should parse absolute URLs, ignoring unparseable ones inside arrays', () => {
-    expectSpecifierMap(
-      `{
-        "unparseable1": ["https://ex ample.org/"],
-        "unparseable2": ["https://example.com:demo"],
-        "unparseable3": ["http://[www.example.com]/"],
-        "invalidButParseable1": ["https:example.org"],
-        "invalidButParseable2": ["https://///example.com///"],
-        "prettyNormal": ["https://example.net"],
-        "percentDecoding": ["https://ex%41mple.com/"],
-        "noPercentDecoding": ["https://example.com/%41"]
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        unparseable1: [],
-        unparseable2: [],
-        unparseable3: [],
-        invalidButParseable1: [expect.toMatchURL('https://example.org/')],
-        invalidButParseable2: [expect.toMatchURL('https://example.com///')],
-        prettyNormal: [expect.toMatchURL('https://example.net/')],
-        percentDecoding: [expect.toMatchURL('https://example.com/')],
-        noPercentDecoding: [expect.toMatchURL('https://example.com/%41')]
-      },
-      [
-        `Invalid address "https://ex ample.org/" for the specifier key "unparseable1".`,
-        `Invalid address "https://example.com:demo" for the specifier key "unparseable2".`,
-        `Invalid address "http://[www.example.com]/" for the specifier key "unparseable3".`
-      ]
-    );
-  });
-});
-
-describe('Failing addresses: mismatched trailing slashes', () => {
-  it('should warn for the simple case', () => {
-    expectSpecifierMap(
-      `{
-        "trailer/": "/notrailer",
-        "${BUILT_IN_MODULE_SCHEME}:trailer/": "/bim-notrailer"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        'trailer/': [],
-        [`${BUILT_IN_MODULE_SCHEME}:trailer/`]: []
-      },
-      [
-        `Invalid address "https://base.example/notrailer" for package specifier key "trailer/". Package addresses must end with "/".`,
-        `Invalid address "https://base.example/bim-notrailer" for package specifier key "${BUILT_IN_MODULE_SCHEME}:trailer/". Package addresses must end with "/".`
-      ]
-    );
-  });
-
-  it('should warn for a mismatch alone in an array', () => {
-    expectSpecifierMap(
-      `{
-        "trailer/": ["/notrailer"],
-        "${BUILT_IN_MODULE_SCHEME}:trailer/": ["/bim-notrailer"]
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        'trailer/': [],
-        [`${BUILT_IN_MODULE_SCHEME}:trailer/`]: []
-      },
-      [
-        `Invalid address "https://base.example/notrailer" for package specifier key "trailer/". Package addresses must end with "/".`,
-        `Invalid address "https://base.example/bim-notrailer" for package specifier key "${BUILT_IN_MODULE_SCHEME}:trailer/". Package addresses must end with "/".`
-      ]
-    );
-  });
-
-  it('should warn for a mismatch alongside non-mismatches in an array', () => {
-    expectSpecifierMap(
-      `{
-        "trailer/": ["/atrailer/", "/notrailer"],
-        "${BUILT_IN_MODULE_SCHEME}:trailer/": ["/bim-atrailer/", "/bim-notrailer"]
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        'trailer/': [expect.toMatchURL('https://base.example/atrailer/')],
-        [`${BUILT_IN_MODULE_SCHEME}:trailer/`]: [expect.toMatchURL('https://base.example/bim-atrailer/')]
-      },
-      [
-        `Invalid address "https://base.example/notrailer" for package specifier key "trailer/". Package addresses must end with "/".`,
-        `Invalid address "https://base.example/bim-notrailer" for package specifier key "${BUILT_IN_MODULE_SCHEME}:trailer/". Package addresses must end with "/".`
-      ]
-    );
-  });
-});
-
-describe('Other invalid addresses', () => {
-  it('should ignore unprefixed strings that are not absolute URLs', () => {
-    for (const bad of ['bar', '\\bar', '~bar', '#bar', '?bar']) {
-      expectSpecifierMap(
-        `{
-          "foo": ${JSON.stringify(bad)}
-        }`,
-        'https://base.example/path1/path2/path3',
-        {
-          foo: []
-        },
-        [`Invalid address "${bad}" for the specifier key "foo".`]
-      );
-    }
-  });
-});
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/parsing-schema.js b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/parsing-schema.js
deleted file mode 100644
index 72b6e625d61..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/parsing-schema.js
+++ /dev/null
@@ -1,139 +0,0 @@
-'use strict';
-const { parseFromString } = require('../lib/parser.js');
-const { expectBad, expectWarnings, expectSpecifierMap } = require('./helpers/parsing.js');
-
-const nonObjectStrings = ['null', 'true', '1', '"foo"', '[]'];
-
-test('Invalid JSON', () => {
-  expect(parseFromString('{ imports: {} }', 'https://base.example/')).toThrow('SyntaxError');
-});
-
-describe('Mismatching the top-level schema', () => {
-  it('should throw for top-level non-objects', () => {
-    for (const nonObject of nonObjectStrings) {
-      expectBad(nonObject, 'https://base.example/');
-    }
-  });
-
-  it('should throw if imports is a non-object', () => {
-    for (const nonObject of nonObjectStrings) {
-      expectBad(`{ "imports": ${nonObject} }`, 'https://base.example/');
-    }
-  });
-
-  it('should throw if scopes is a non-object', () => {
-    for (const nonObject of nonObjectStrings) {
-      expectBad(`{ "scopes": ${nonObject} }`, 'https://base.example/');
-    }
-  });
-
-  it('should ignore unspecified top-level entries', () => {
-    expectWarnings(
-      `{
-        "imports": {},
-        "new-feature": {},
-        "scops": {}
-      }`,
-      'https://base.example/',
-      { imports: {}, scopes: {} },
-      [
-        `Invalid top-level key "new-feature". Only "imports" and "scopes" can be present.`,
-        `Invalid top-level key "scops". Only "imports" and "scopes" can be present.`
-      ]
-    );
-  });
-});
-
-describe('Mismatching the specifier map schema', () => {
-  const invalidAddressStrings = ['true', '1', '{}'];
-  const invalidInsideArrayStrings = ['null', 'true', '1', '{}', '[]'];
-
-  it('should ignore entries where the address is not a string, array, or null', () => {
-    for (const invalid of invalidAddressStrings) {
-      expectSpecifierMap(
-        `{
-          "foo": ${invalid},
-          "bar": ["https://example.com/"]
-        }`,
-        'https://base.example/',
-        {
-          bar: [expect.toMatchURL('https://example.com/')]
-        },
-        [
-          `Invalid address ${invalid} for the specifier key "foo". ` +
-          `Addresses must be strings, arrays, or null.`
-        ]
-      );
-    }
-  });
-
-  it('should ignore entries where the specifier key is an empty string', () => {
-    expectSpecifierMap(
-      `{
-        "": ["https://example.com/"]
-      }`,
-      'https://base.example/',
-      {},
-      [`Invalid empty string specifier key.`]
-    );
-  });
-
-  it('should ignore members of an address array that are not strings', () => {
-    for (const invalid of invalidInsideArrayStrings) {
-      expectSpecifierMap(
-        `{
-          "foo": ["https://example.com/", ${invalid}],
-          "bar": ["https://example.com/"]
-        }`,
-        'https://base.example/',
-        {
-          foo: [expect.toMatchURL('https://example.com/')],
-          bar: [expect.toMatchURL('https://example.com/')]
-        },
-        [
-          `Invalid address ${invalid} inside the address array for the specifier key "foo". ` +
-          `Address arrays must only contain strings.`
-        ]
-      );
-    }
-  });
-
-  it('should throw if a scope\'s value is not an object', () => {
-    for (const invalid of nonObjectStrings) {
-      expectBad(`{ "scopes": { "https://scope.example/": ${invalid} } }`, 'https://base.example/');
-    }
-  });
-});
-
-describe('Normalization', () => {
-  it('should normalize empty import maps to have imports and scopes keys', () => {
-    expect(parseFromString(`{}`, 'https://base.example/'))
-      .toEqual({ imports: {}, scopes: {} });
-  });
-
-  it('should normalize an import map without imports to have imports', () => {
-    expect(parseFromString(`{ "scopes": {} }`, 'https://base.example/'))
-      .toEqual({ imports: {}, scopes: {} });
-  });
-
-  it('should normalize an import map without scopes to have scopes', () => {
-    expect(parseFromString(`{ "imports": {} }`, 'https://base.example/'))
-      .toEqual({ imports: {}, scopes: {} });
-  });
-
-  it('should normalize addresses to arrays', () => {
-    expectSpecifierMap(
-      `{
-        "foo": "https://example.com/1",
-        "bar": ["https://example.com/2"],
-        "baz": null
-      }`,
-      'https://base.example/',
-      {
-        foo: [expect.toMatchURL('https://example.com/1')],
-        bar: [expect.toMatchURL('https://example.com/2')],
-        baz: []
-      }
-    );
-  });
-});
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/parsing-scope-keys.js b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/parsing-scope-keys.js
deleted file mode 100644
index 4993f3a9a8b..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/parsing-scope-keys.js
+++ /dev/null
@@ -1,144 +0,0 @@
-'use strict';
-const { expectScopes } = require('./helpers/parsing.js');
-
-describe('Relative URL scope keys', () => {
-  it('should work with no prefix', () => {
-    expectScopes(
-      ['foo'],
-      'https://base.example/path1/path2/path3',
-      ['https://base.example/path1/path2/foo']
-    );
-  });
-
-  it('should work with ./, ../, and / prefixes', () => {
-    expectScopes(
-      ['./foo', '../foo', '/foo'],
-      'https://base.example/path1/path2/path3',
-      [
-        'https://base.example/path1/path2/foo',
-        'https://base.example/path1/foo',
-        'https://base.example/foo'
-      ]
-    );
-  });
-
-  it('should work with /s, ?s, and #s', () => {
-    expectScopes(
-      ['foo/bar?baz#qux'],
-      'https://base.example/path1/path2/path3',
-      ['https://base.example/path1/path2/foo/bar?baz#qux']
-    );
-  });
-
-  it('should work with an empty string scope key', () => {
-    expectScopes(
-      [''],
-      'https://base.example/path1/path2/path3',
-      ['https://base.example/path1/path2/path3']
-    );
-  });
-
-  it('should work with / suffixes', () => {
-    expectScopes(
-      ['foo/', './foo/', '../foo/', '/foo/', '/foo//'],
-      'https://base.example/path1/path2/path3',
-      [
-        'https://base.example/path1/path2/foo/',
-        'https://base.example/path1/path2/foo/',
-        'https://base.example/path1/foo/',
-        'https://base.example/foo/',
-        'https://base.example/foo//'
-      ]
-    );
-  });
-
-  it('should deduplicate based on URL parsing rules', () => {
-    expectScopes(
-      ['foo/\\', 'foo//', 'foo\\\\'],
-      'https://base.example/path1/path2/path3',
-      ['https://base.example/path1/path2/foo//']
-    );
-  });
-});
-
-describe('Absolute URL scope keys', () => {
-  it('should accept all absolute URL scope keys, with or without fetch schemes', () => {
-    expectScopes(
-      [
-        'about:good',
-        'blob:good',
-        'data:good',
-        'file:///good',
-        'filesystem:http://example.com/good/',
-        'http://good/',
-        'https://good/',
-        'ftp://good/',
-        'import:bad',
-        'mailto:bad',
-        'javascript:bad',
-        'wss:ba'
-      ],
-      'https://base.example/path1/path2/path3',
-      [
-        'about:good',
-        'blob:good',
-        'data:good',
-        'file:///good',
-        'filesystem:http://example.com/good/',
-        'http://good/',
-        'https://good/',
-        'ftp://good/',
-        'import:bad',
-        'mailto:bad',
-        'javascript:bad',
-        'wss://ba/'
-      ],
-      []
-    );
-  });
-
-  it('should parse absolute URL scope keys, ignoring unparseable ones', () => {
-    expectScopes(
-      [
-        'https://ex ample.org/',
-        'https://example.com:demo',
-        'http://[www.example.com]/',
-        'https:example.org',
-        'https://///example.com///',
-        'https://example.net',
-        'https://ex%41mple.com/foo/',
-        'https://example.com/%41'
-      ],
-      'https://base.example/path1/path2/path3',
-      [
-        'https://base.example/path1/path2/example.org', // tricky case! remember we have a base URL
-        'https://example.com///',
-        'https://example.net/',
-        'https://example.com/foo/',
-        'https://example.com/%41'
-      ],
-      [
-        'Invalid scope "https://ex ample.org/" (parsed against base URL "https://base.example/path1/path2/path3").',
-        'Invalid scope "https://example.com:demo" (parsed against base URL "https://base.example/path1/path2/path3").',
-        'Invalid scope "http://[www.example.com]/" (parsed against base URL "https://base.example/path1/path2/path3").'
-      ]
-    );
-  });
-
-  it('should ignore relative URL scope keys when the base URL is a data: URL', () => {
-    expectScopes(
-      [
-        './foo',
-        '../foo',
-        '/foo'
-      ],
-      'data:text/html,test',
-      [],
-      [
-        'Invalid scope "./foo" (parsed against base URL "data:text/html,test").',
-        'Invalid scope "../foo" (parsed against base URL "data:text/html,test").',
-        'Invalid scope "/foo" (parsed against base URL "data:text/html,test").'
-      ]
-    );
-  });
-});
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/parsing-specifier-keys.js b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/parsing-specifier-keys.js
deleted file mode 100644
index 9eb423a19eb..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/parsing-specifier-keys.js
+++ /dev/null
@@ -1,159 +0,0 @@
-'use strict';
-const { expectSpecifierMap } = require('./helpers/parsing.js');
-const { BUILT_IN_MODULE_SCHEME } = require('../lib/utils.js');
-
-const BLANK = `${BUILT_IN_MODULE_SCHEME}:blank`;
-
-describe('Relative URL-like specifier keys', () => {
-  it('should absolutize strings prefixed with ./, ../, or / into the corresponding URLs', () => {
-    expectSpecifierMap(
-      `{
-        "./foo": "/dotslash",
-        "../foo": "/dotdotslash",
-        "/foo": "/slash"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        'https://base.example/path1/path2/foo': [expect.toMatchURL('https://base.example/dotslash')],
-        'https://base.example/path1/foo': [expect.toMatchURL('https://base.example/dotdotslash')],
-        'https://base.example/foo': [expect.toMatchURL('https://base.example/slash')]
-      }
-    );
-  });
-
-  it('should not absolutize strings prefixed with ./, ../, or / with a data: URL base', () => {
-    expectSpecifierMap(
-      `{
-        "./foo": "https://example.com/dotslash",
-        "../foo": "https://example.com/dotdotslash",
-        "/foo": "https://example.com/slash"
-      }`,
-      'data:text/html,test',
-      {
-        './foo': [expect.toMatchURL('https://example.com/dotslash')],
-        '../foo': [expect.toMatchURL('https://example.com/dotdotslash')],
-        '/foo': [expect.toMatchURL('https://example.com/slash')]
-      }
-    );
-  });
-
-  it('should absolutize the literal strings ./, ../, or / with no suffix', () => {
-    expectSpecifierMap(
-      `{
-        "./": "/dotslash/",
-        "../": "/dotdotslash/",
-        "/": "/slash/"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        'https://base.example/path1/path2/': [expect.toMatchURL('https://base.example/dotslash/')],
-        'https://base.example/path1/': [expect.toMatchURL('https://base.example/dotdotslash/')],
-        'https://base.example/': [expect.toMatchURL('https://base.example/slash/')]
-      }
-    );
-  });
-
-  it('should treat percent-encoded variants of ./, ../, or / as bare specifiers', () => {
-    expectSpecifierMap(
-      `{
-        "%2E/": "/dotSlash1/",
-        "%2E%2E/": "/dotDotSlash1/",
-        ".%2F": "/dotSlash2",
-        "..%2F": "/dotDotSlash2",
-        "%2F": "/slash2",
-        "%2E%2F": "/dotSlash3",
-        "%2E%2E%2F": "/dotDotSlash3"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        '%2E/': [expect.toMatchURL('https://base.example/dotSlash1/')],
-        '%2E%2E/': [expect.toMatchURL('https://base.example/dotDotSlash1/')],
-        '.%2F': [expect.toMatchURL('https://base.example/dotSlash2')],
-        '..%2F': [expect.toMatchURL('https://base.example/dotDotSlash2')],
-        '%2F': [expect.toMatchURL('https://base.example/slash2')],
-        '%2E%2F': [expect.toMatchURL('https://base.example/dotSlash3')],
-        '%2E%2E%2F': [expect.toMatchURL('https://base.example/dotDotSlash3')]
-      }
-    );
-  });
-});
-
-describe('Absolute URL specifier keys', () => {
-  it('should only accept absolute URL specifier keys with fetch schemes, treating others as bare specifiers', () => {
-    expectSpecifierMap(
-      `{
-        "about:good": "/about",
-        "blob:good": "/blob",
-        "data:good": "/data",
-        "file:///good": "/file",
-        "filesystem:good": "/filesystem",
-        "http://good/": "/http/",
-        "https://good/": "/https/",
-        "ftp://good/": "/ftp/",
-        "import:bad": "/import",
-        "mailto:bad": "/mailto",
-        "javascript:bad": "/javascript",
-        "wss:bad": "/wss"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        'about:good': [expect.toMatchURL('https://base.example/about')],
-        'blob:good': [expect.toMatchURL('https://base.example/blob')],
-        'data:good': [expect.toMatchURL('https://base.example/data')],
-        'file:///good': [expect.toMatchURL('https://base.example/file')],
-        'filesystem:good': [expect.toMatchURL('https://base.example/filesystem')],
-        'http://good/': [expect.toMatchURL('https://base.example/http/')],
-        'https://good/': [expect.toMatchURL('https://base.example/https/')],
-        'ftp://good/': [expect.toMatchURL('https://base.example/ftp/')],
-        'import:bad': [expect.toMatchURL('https://base.example/import')],
-        'mailto:bad': [expect.toMatchURL('https://base.example/mailto')],
-        'javascript:bad': [expect.toMatchURL('https://base.example/javascript')],
-        'wss:bad': [expect.toMatchURL('https://base.example/wss')]
-      }
-    );
-  });
-
-  it('should parse absolute URLs, treating unparseable ones as bare specifiers', () => {
-    expectSpecifierMap(
-      `{
-        "https://ex ample.org/": "/unparseable1/",
-        "https://example.com:demo": "/unparseable2",
-        "http://[www.example.com]/": "/unparseable3/",
-        "https:example.org": "/invalidButParseable1/",
-        "https://///example.com///": "/invalidButParseable2/",
-        "https://example.net": "/prettyNormal/",
-        "https://ex%41mple.com/": "/percentDecoding/",
-        "https://example.com/%41": "/noPercentDecoding"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        'https://ex ample.org/': [expect.toMatchURL('https://base.example/unparseable1/')],
-        'https://example.com:demo': [expect.toMatchURL('https://base.example/unparseable2')],
-        'http://[www.example.com]/': [expect.toMatchURL('https://base.example/unparseable3/')],
-        'https://example.org/': [expect.toMatchURL('https://base.example/invalidButParseable1/')],
-        'https://example.com///': [expect.toMatchURL('https://base.example/invalidButParseable2/')],
-        'https://example.net/': [expect.toMatchURL('https://base.example/prettyNormal/')],
-        'https://example.com/': [expect.toMatchURL('https://base.example/percentDecoding/')],
-        'https://example.com/%41': [expect.toMatchURL('https://base.example/noPercentDecoding')]
-      }
-    );
-  });
-
-  it('should parse built-in module specifier keys, including with a "/"', () => {
-    expectSpecifierMap(
-      `{
-        "${BLANK}": "/blank",
-        "${BLANK}/": "/blank/",
-        "${BLANK}/foo": "/blank/foo",
-        "${BLANK}\\\\foo": "/blank/backslashfoo"
-      }`,
-      'https://base.example/path1/path2/path3',
-      {
-        [BLANK]: [expect.toMatchURL('https://base.example/blank')],
-        [`${BLANK}/`]: [expect.toMatchURL('https://base.example/blank/')],
-        [`${BLANK}/foo`]: [expect.toMatchURL('https://base.example/blank/foo')],
-        [`${BLANK}\\foo`]: [expect.toMatchURL('https://base.example/blank/backslashfoo')]
-      }
-    );
-  });
-});
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/resolving-builtins.js b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/resolving-builtins.js
deleted file mode 100644
index a9383df843d..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/resolving-builtins.js
+++ /dev/null
@@ -1,158 +0,0 @@
-'use strict';
-const { URL } = require('url');
-const { parseFromString } = require('../lib/parser.js');
-const { resolve } = require('../lib/resolver.js');
-const { BUILT_IN_MODULE_SCHEME } = require('../lib/utils.js');
-
-const mapBaseURL = new URL('https://example.com/app/index.html');
-const scriptURL = new URL('https://example.com/js/app.mjs');
-
-const BLANK = `${BUILT_IN_MODULE_SCHEME}:blank`;
-const NONE = `${BUILT_IN_MODULE_SCHEME}:none`;
-
-function makeResolveUnderTest(mapString) {
-  const map = parseFromString(mapString, mapBaseURL);
-  return specifier => resolve(specifier, map, scriptURL);
-}
-
-describe('Unmapped built-in module specifiers', () => {
-  const resolveUnderTest = makeResolveUnderTest(`{}`);
-
-  it(`should resolve "${BLANK}" to "${BLANK}"`, () => {
-    expect(resolveUnderTest(BLANK)).toMatchURL(BLANK);
-  });
-
-  it(`should error resolving "${NONE}"`, () => {
-    expect(() => resolveUnderTest(NONE)).toThrow(TypeError);
-  });
-});
-
-describe('Remapping built-in module specifiers', () => {
-  it('should remap built-in modules', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "${BLANK}": "./blank.mjs",
-        "${NONE}": "./none.mjs"
-      }
-    }`);
-
-    expect(resolveUnderTest(BLANK)).toMatchURL('https://example.com/app/blank.mjs');
-    expect(resolveUnderTest(NONE)).toMatchURL('https://example.com/app/none.mjs');
-  });
-
-  it('should remap built-in modules with slashes', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "${BLANK}/": "./blank-slash/",
-        "${BLANK}/foo": "./blank-foo.mjs",
-        "${NONE}/": "./none-slash/",
-        "${NONE}/foo": "./none-foo.mjs"
-      }
-    }`);
-
-    expect(resolveUnderTest(`${BLANK}/`)).toMatchURL('https://example.com/app/blank-slash/');
-    expect(resolveUnderTest(`${BLANK}/foo`)).toMatchURL('https://example.com/app/blank-foo.mjs');
-    expect(resolveUnderTest(`${BLANK}/bar`)).toMatchURL('https://example.com/app/blank-slash/bar');
-    expect(resolveUnderTest(`${NONE}/`)).toMatchURL('https://example.com/app/none-slash/');
-    expect(resolveUnderTest(`${NONE}/foo`)).toMatchURL('https://example.com/app/none-foo.mjs');
-    expect(resolveUnderTest(`${NONE}/bar`)).toMatchURL('https://example.com/app/none-slash/bar');
-  });
-
-  it('should remap built-in modules with fallbacks', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "${BLANK}": ["${BLANK}", "./blank.mjs"],
-        "${NONE}": ["${NONE}", "./none.mjs"]
-      }
-    }`);
-
-    expect(resolveUnderTest(BLANK)).toMatchURL(BLANK);
-    expect(resolveUnderTest(NONE)).toMatchURL('https://example.com/app/none.mjs');
-  });
-
-  it('should remap built-in modules with slashes and fallbacks', () => {
-    // NOTE: `${BLANK}/for-testing` is not per spec, just for these tests.
-    // See resolver.js.
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "${BLANK}/": ["${BLANK}/", "./blank/"],
-        "${BLANK}/for-testing": ["${BLANK}/for-testing", "./blank-for-testing-special"],
-        "${NONE}/": ["${NONE}/", "./none/"],
-        "${NONE}/foo": ["${NONE}/foo", "./none-foo-special"]
-      }
-    }`);
-
-    // Built-in modules only resolve for exact matches, so this will trigger the fallback.
-    expect(resolveUnderTest(`${BLANK}/`)).toMatchURL('https://example.com/app/blank/');
-    expect(resolveUnderTest(`${BLANK}/foo`)).toMatchURL('https://example.com/app/blank/foo');
-
-    // This would fall back in a real implementation; it's only because we've gone against
-    // spec in the reference implementation (to make this testable) that this maps.
-    expect(resolveUnderTest(`${BLANK}/for-testing`)).toMatchURL(`${BLANK}/for-testing`);
-
-    expect(resolveUnderTest(`${NONE}/`)).toMatchURL('https://example.com/app/none/');
-    expect(resolveUnderTest(`${NONE}/bar`)).toMatchURL('https://example.com/app/none/bar');
-    expect(resolveUnderTest(`${NONE}/foo`)).toMatchURL('https://example.com/app/none-foo-special');
-  });
-});
-
-describe('Remapping to built-in modules', () => {
-  const resolveUnderTest = makeResolveUnderTest(`{
-    "imports": {
-      "blank": "${BLANK}",
-      "/blank": "${BLANK}",
-      "/blank/": "${BLANK}/",
-      "/blank-for-testing": "${BLANK}/for-testing",
-      "none": "${NONE}",
-      "/none": "${NONE}"
-    }
-  }`);
-
-  it(`should remap to "${BLANK}"`, () => {
-    expect(resolveUnderTest('blank')).toMatchURL(BLANK);
-    expect(resolveUnderTest('/blank')).toMatchURL(BLANK);
-  });
-
-  it(`should fail when remapping to "${BLANK}/"`, () => {
-    expect(() => resolveUnderTest('/blank/')).toThrow(TypeError);
-  });
-
-  it(`should remap to "${BLANK}/for-testing"`, () => {
-    expect(resolveUnderTest('/blank/for-testing')).toMatchURL(`${BLANK}/for-testing`);
-    expect(resolveUnderTest('/blank-for-testing')).toMatchURL(`${BLANK}/for-testing`);
-  });
-
-  it(`should remap to "${BLANK}" for URL-like specifiers`, () => {
-    expect(resolveUnderTest('/blank')).toMatchURL(BLANK);
-    expect(resolveUnderTest('https://example.com/blank')).toMatchURL(BLANK);
-    expect(resolveUnderTest('https://///example.com/blank')).toMatchURL(BLANK);
-  });
-
-  it(`should fail when remapping to "${NONE}"`, () => {
-    expect(() => resolveUnderTest('none')).toThrow(TypeError);
-    expect(() => resolveUnderTest('/none')).toThrow(TypeError);
-  });
-});
-
-describe('Fallbacks with built-in module addresses', () => {
-  const resolveUnderTest = makeResolveUnderTest(`{
-    "imports": {
-      "blank": [
-        "${BLANK}",
-        "./blank-fallback.mjs"
-      ],
-      "none": [
-        "${NONE}",
-        "./none-fallback.mjs"
-      ]
-    }
-  }`);
-
-  it(`should resolve to "${BLANK}"`, () => {
-    expect(resolveUnderTest('blank')).toMatchURL(BLANK);
-  });
-
-  it(`should fall back past "${NONE}"`, () => {
-    expect(resolveUnderTest('none')).toMatchURL('https://example.com/app/none-fallback.mjs');
-  });
-});
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/resolving-not-yet-implemented.js b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/resolving-not-yet-implemented.js
deleted file mode 100644
index 93d782fdad8..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/resolving-not-yet-implemented.js
+++ /dev/null
@@ -1,47 +0,0 @@
-'use strict';
-const { URL } = require('url');
-const { parseFromString } = require('../lib/parser.js');
-const { resolve } = require('../lib/resolver.js');
-const { BUILT_IN_MODULE_SCHEME } = require('../lib/utils.js');
-
-const mapBaseURL = new URL('https://example.com/app/index.html');
-const scriptURL = new URL('https://example.com/js/app.mjs');
-
-const BLANK = `${BUILT_IN_MODULE_SCHEME}:blank`;
-
-function makeResolveUnderTest(mapString) {
-  const map = parseFromString(mapString, mapBaseURL);
-  return specifier => resolve(specifier, map, scriptURL);
-}
-
-describe('Fallbacks that are not [built-in, fetch scheme]', () => {
-  const resolveUnderTest = makeResolveUnderTest(`{
-    "imports": {
-      "bad1": [
-        "${BLANK}",
-        "${BLANK}"
-      ],
-      "bad2": [
-        "${BLANK}",
-        "/bad2-1.mjs",
-        "/bad2-2.mjs"
-      ],
-      "bad3": [
-        "/bad3-1.mjs",
-        "/bad3-2.mjs"
-      ]
-    }
-  }`);
-
-  it('should fail for [built-in, built-in]', () => {
-    expect(() => resolveUnderTest('bad1')).toThrow(/not yet implemented/);
-  });
-
-  it('should fail for [built-in, fetch scheme, fetch scheme]', () => {
-    expect(() => resolveUnderTest('bad2')).toThrow(/not yet implemented/);
-  });
-
-  it('should fail for [fetch scheme, fetch scheme]', () => {
-    expect(() => resolveUnderTest('bad3')).toThrow(/not yet implemented/);
-  });
-});
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/resolving-scopes.js b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/resolving-scopes.js
deleted file mode 100644
index ca19a668406..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/resolving-scopes.js
+++ /dev/null
@@ -1,230 +0,0 @@
-'use strict';
-const { URL } = require('url');
-const { parseFromString } = require('../lib/parser.js');
-const { resolve } = require('../lib/resolver.js');
-
-const mapBaseURL = new URL('https://example.com/app/index.html');
-
-function makeResolveUnderTest(mapString) {
-  const map = parseFromString(mapString, mapBaseURL);
-  return (specifier, baseURL) => resolve(specifier, map, baseURL);
-}
-
-describe('Mapped using scope instead of "imports"', () => {
-  const jsNonDirURL = new URL('https://example.com/js');
-  const jsPrefixedURL = new URL('https://example.com/jsiscool');
-  const inJSDirURL = new URL('https://example.com/js/app.mjs');
-  const topLevelURL = new URL('https://example.com/app.mjs');
-
-  it('should fail when the mapping is to an empty array', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "scopes": {
-        "/js/": {
-          "moment": null,
-          "lodash": []
-        }
-      }
-    }`);
-
-    expect(() => resolveUnderTest('moment', inJSDirURL)).toThrow(TypeError);
-    expect(() => resolveUnderTest('lodash', inJSDirURL)).toThrow(TypeError);
-  });
-
-  describe('Exact vs. prefix based matching', () => {
-    it('should match correctly when both are in the map', () => {
-      const resolveUnderTest = makeResolveUnderTest(`{
-        "scopes": {
-          "/js": {
-            "moment": "/only-triggered-by-exact/moment",
-            "moment/": "/only-triggered-by-exact/moment/"
-          },
-          "/js/": {
-            "moment": "/triggered-by-any-subpath/moment",
-            "moment/": "/triggered-by-any-subpath/moment/"
-          }
-        }
-      }`);
-
-      expect(resolveUnderTest('moment', jsNonDirURL)).toMatchURL('https://example.com/only-triggered-by-exact/moment');
-      expect(resolveUnderTest('moment/foo', jsNonDirURL)).toMatchURL('https://example.com/only-triggered-by-exact/moment/foo');
-
-      expect(resolveUnderTest('moment', inJSDirURL)).toMatchURL('https://example.com/triggered-by-any-subpath/moment');
-      expect(resolveUnderTest('moment/foo', inJSDirURL)).toMatchURL('https://example.com/triggered-by-any-subpath/moment/foo');
-
-      expect(() => resolveUnderTest('moment', jsPrefixedURL)).toThrow(TypeError);
-      expect(() => resolveUnderTest('moment/foo', jsPrefixedURL)).toThrow(TypeError);
-    });
-
-    it('should match correctly when only an exact match is in the map', () => {
-      const resolveUnderTest = makeResolveUnderTest(`{
-        "scopes": {
-          "/js": {
-            "moment": "/only-triggered-by-exact/moment",
-            "moment/": "/only-triggered-by-exact/moment/"
-          }
-        }
-      }`);
-
-      expect(resolveUnderTest('moment', jsNonDirURL)).toMatchURL('https://example.com/only-triggered-by-exact/moment');
-      expect(resolveUnderTest('moment/foo', jsNonDirURL)).toMatchURL('https://example.com/only-triggered-by-exact/moment/foo');
-
-      expect(() => resolveUnderTest('moment', inJSDirURL)).toThrow(TypeError);
-      expect(() => resolveUnderTest('moment/foo', inJSDirURL)).toThrow(TypeError);
-
-      expect(() => resolveUnderTest('moment', jsPrefixedURL)).toThrow(TypeError);
-      expect(() => resolveUnderTest('moment/foo', jsPrefixedURL)).toThrow(TypeError);
-    });
-
-    it('should match correctly when only a prefix match is in the map', () => {
-      const resolveUnderTest = makeResolveUnderTest(`{
-        "scopes": {
-          "/js/": {
-            "moment": "/triggered-by-any-subpath/moment",
-            "moment/": "/triggered-by-any-subpath/moment/"
-          }
-        }
-      }`);
-
-      expect(() => resolveUnderTest('moment', jsNonDirURL)).toThrow(TypeError);
-      expect(() => resolveUnderTest('moment/foo', jsNonDirURL)).toThrow(TypeError);
-
-      expect(resolveUnderTest('moment', inJSDirURL)).toMatchURL('https://example.com/triggered-by-any-subpath/moment');
-      expect(resolveUnderTest('moment/foo', inJSDirURL)).toMatchURL('https://example.com/triggered-by-any-subpath/moment/foo');
-
-      expect(() => resolveUnderTest('moment', jsPrefixedURL)).toThrow(TypeError);
-      expect(() => resolveUnderTest('moment/foo', jsPrefixedURL)).toThrow(TypeError);
-    });
-  });
-
-  describe('Package-like scenarios', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "moment": "/node_modules/moment/src/moment.js",
-        "moment/": "/node_modules/moment/src/",
-        "lodash-dot": "./node_modules/lodash-es/lodash.js",
-        "lodash-dot/": "./node_modules/lodash-es/",
-        "lodash-dotdot": "../node_modules/lodash-es/lodash.js",
-        "lodash-dotdot/": "../node_modules/lodash-es/"
-      },
-      "scopes": {
-        "/": {
-          "moment": "/node_modules_3/moment/src/moment.js",
-          "vue": "/node_modules_3/vue/dist/vue.runtime.esm.js"
-        },
-        "/js/": {
-          "lodash-dot": "./node_modules_2/lodash-es/lodash.js",
-          "lodash-dot/": "./node_modules_2/lodash-es/",
-          "lodash-dotdot": "../node_modules_2/lodash-es/lodash.js",
-          "lodash-dotdot/": "../node_modules_2/lodash-es/"
-        }
-      }
-    }`);
-
-    it('should resolve scoped', () => {
-      expect(resolveUnderTest('lodash-dot', inJSDirURL)).toMatchURL('https://example.com/app/node_modules_2/lodash-es/lodash.js');
-      expect(resolveUnderTest('lodash-dotdot', inJSDirURL)).toMatchURL('https://example.com/node_modules_2/lodash-es/lodash.js');
-      expect(resolveUnderTest('lodash-dot/foo', inJSDirURL)).toMatchURL('https://example.com/app/node_modules_2/lodash-es/foo');
-      expect(resolveUnderTest('lodash-dotdot/foo', inJSDirURL)).toMatchURL('https://example.com/node_modules_2/lodash-es/foo');
-    });
-
-    it('should apply best scope match', () => {
-      expect(resolveUnderTest('moment', topLevelURL)).toMatchURL('https://example.com/node_modules_3/moment/src/moment.js');
-      expect(resolveUnderTest('moment', inJSDirURL)).toMatchURL('https://example.com/node_modules_3/moment/src/moment.js');
-      expect(resolveUnderTest('vue', inJSDirURL)).toMatchURL('https://example.com/node_modules_3/vue/dist/vue.runtime.esm.js');
-    });
-
-    it('should fallback to "imports"', () => {
-      expect(resolveUnderTest('moment/foo', topLevelURL)).toMatchURL('https://example.com/node_modules/moment/src/foo');
-      expect(resolveUnderTest('moment/foo', inJSDirURL)).toMatchURL('https://example.com/node_modules/moment/src/foo');
-      expect(resolveUnderTest('lodash-dot', topLevelURL)).toMatchURL('https://example.com/app/node_modules/lodash-es/lodash.js');
-      expect(resolveUnderTest('lodash-dotdot', topLevelURL)).toMatchURL('https://example.com/node_modules/lodash-es/lodash.js');
-      expect(resolveUnderTest('lodash-dot/foo', topLevelURL)).toMatchURL('https://example.com/app/node_modules/lodash-es/foo');
-      expect(resolveUnderTest('lodash-dotdot/foo', topLevelURL)).toMatchURL('https://example.com/node_modules/lodash-es/foo');
-    });
-
-    it('should still fail for package-like specifiers that are not declared', () => {
-      expect(() => resolveUnderTest('underscore/', inJSDirURL)).toThrow(TypeError);
-      expect(() => resolveUnderTest('underscore/foo', inJSDirURL)).toThrow(TypeError);
-    });
-  });
-
-  describe('The scope inheritance example from the README', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "a": "/a-1.mjs",
-        "b": "/b-1.mjs",
-        "c": "/c-1.mjs"
-      },
-      "scopes": {
-        "/scope2/": {
-          "a": "/a-2.mjs"
-        },
-        "/scope2/scope3/": {
-          "b": "/b-3.mjs"
-        }
-      }
-    }`);
-
-    const scope1URL = new URL('https://example.com/scope1/foo.mjs');
-    const scope2URL = new URL('https://example.com/scope2/foo.mjs');
-    const scope3URL = new URL('https://example.com/scope2/scope3/foo.mjs');
-
-    it('should fall back to "imports" when none match', () => {
-      expect(resolveUnderTest('a', scope1URL)).toMatchURL('https://example.com/a-1.mjs');
-      expect(resolveUnderTest('b', scope1URL)).toMatchURL('https://example.com/b-1.mjs');
-      expect(resolveUnderTest('c', scope1URL)).toMatchURL('https://example.com/c-1.mjs');
-    });
-
-    it('should use a direct scope override', () => {
-      expect(resolveUnderTest('a', scope2URL)).toMatchURL('https://example.com/a-2.mjs');
-      expect(resolveUnderTest('b', scope2URL)).toMatchURL('https://example.com/b-1.mjs');
-      expect(resolveUnderTest('c', scope2URL)).toMatchURL('https://example.com/c-1.mjs');
-    });
-
-    it('should use an indirect scope override', () => {
-      expect(resolveUnderTest('a', scope3URL)).toMatchURL('https://example.com/a-2.mjs');
-      expect(resolveUnderTest('b', scope3URL)).toMatchURL('https://example.com/b-3.mjs');
-      expect(resolveUnderTest('c', scope3URL)).toMatchURL('https://example.com/c-1.mjs');
-    });
-  });
-
-  describe('Relative URL scope keys', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "a": "/a-1.mjs",
-        "b": "/b-1.mjs",
-        "c": "/c-1.mjs"
-      },
-      "scopes": {
-        "": {
-          "a": "/a-empty-string.mjs"
-        },
-        "./": {
-          "b": "/b-dot-slash.mjs"
-        },
-        "../": {
-          "c": "/c-dot-dot-slash.mjs"
-        }
-      }
-    }`);
-    const inSameDirAsMap = new URL('./foo.mjs', mapBaseURL);
-    const inDirAboveMap = new URL('../foo.mjs', mapBaseURL);
-
-    it('should resolve an empty string scope using the import map URL', () => {
-      expect(resolveUnderTest('a', mapBaseURL)).toMatchURL('https://example.com/a-empty-string.mjs');
-      expect(resolveUnderTest('a', inSameDirAsMap)).toMatchURL('https://example.com/a-1.mjs');
-    });
-
-    it('should resolve a ./ scope using the import map URL\'s directory', () => {
-      expect(resolveUnderTest('b', mapBaseURL)).toMatchURL('https://example.com/b-dot-slash.mjs');
-      expect(resolveUnderTest('b', inSameDirAsMap)).toMatchURL('https://example.com/b-dot-slash.mjs');
-    });
-
-    it('should resolve a ../ scope using the import map URL\'s directory', () => {
-      expect(resolveUnderTest('c', mapBaseURL)).toMatchURL('https://example.com/c-dot-dot-slash.mjs');
-      expect(resolveUnderTest('c', inSameDirAsMap)).toMatchURL('https://example.com/c-dot-dot-slash.mjs');
-      expect(resolveUnderTest('c', inDirAboveMap)).toMatchURL('https://example.com/c-dot-dot-slash.mjs');
-    });
-  });
-});
-
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/resolving.js b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/resolving.js
deleted file mode 100644
index 29ee31ccbc9..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/imported/resources/resolving.js
+++ /dev/null
@@ -1,270 +0,0 @@
-'use strict';
-const { URL } = require('url');
-const { parseFromString } = require('../lib/parser.js');
-const { resolve } = require('../lib/resolver.js');
-
-const mapBaseURL = new URL('https://example.com/app/index.html');
-const scriptURL = new URL('https://example.com/js/app.mjs');
-
-function makeResolveUnderTest(mapString) {
-  const map = parseFromString(mapString, mapBaseURL);
-  return specifier => resolve(specifier, map, scriptURL);
-}
-
-describe('Unmapped', () => {
-  const resolveUnderTest = makeResolveUnderTest(`{}`);
-
-  it('should resolve ./ specifiers as URLs', () => {
-    expect(resolveUnderTest('./foo')).toMatchURL('https://example.com/js/foo');
-    expect(resolveUnderTest('./foo/bar')).toMatchURL('https://example.com/js/foo/bar');
-    expect(resolveUnderTest('./foo/../bar')).toMatchURL('https://example.com/js/bar');
-    expect(resolveUnderTest('./foo/../../bar')).toMatchURL('https://example.com/bar');
-  });
-
-  it('should resolve ../ specifiers as URLs', () => {
-    expect(resolveUnderTest('../foo')).toMatchURL('https://example.com/foo');
-    expect(resolveUnderTest('../foo/bar')).toMatchURL('https://example.com/foo/bar');
-    expect(resolveUnderTest('../../../foo/bar')).toMatchURL('https://example.com/foo/bar');
-  });
-
-  it('should resolve / specifiers as URLs', () => {
-    expect(resolveUnderTest('/foo')).toMatchURL('https://example.com/foo');
-    expect(resolveUnderTest('/foo/bar')).toMatchURL('https://example.com/foo/bar');
-    expect(resolveUnderTest('/../../foo/bar')).toMatchURL('https://example.com/foo/bar');
-    expect(resolveUnderTest('/../foo/../bar')).toMatchURL('https://example.com/bar');
-  });
-
-  it('should parse absolute fetch-scheme URLs', () => {
-    expect(resolveUnderTest('about:good')).toMatchURL('about:good');
-    expect(resolveUnderTest('https://example.net')).toMatchURL('https://example.net/');
-    expect(resolveUnderTest('https://ex%41mple.com/')).toMatchURL('https://example.com/');
-    expect(resolveUnderTest('https:example.org')).toMatchURL('https://example.org/');
-    expect(resolveUnderTest('https://///example.com///')).toMatchURL('https://example.com///');
-  });
-
-  it('should fail for absolute non-fetch-scheme URLs', () => {
-    expect(() => resolveUnderTest('mailto:bad')).toThrow(TypeError);
-    expect(() => resolveUnderTest('import:bad')).toThrow(TypeError);
-    expect(() => resolveUnderTest('javascript:bad')).toThrow(TypeError);
-    expect(() => resolveUnderTest('wss:bad')).toThrow(TypeError);
-  });
-
-  it('should fail for strings not parseable as absolute URLs and not starting with ./ ../ or /', () => {
-    expect(() => resolveUnderTest('foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('\\foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest(':foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('@foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('%2E/foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('%2E%2E/foo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('.%2Ffoo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('https://ex ample.org/')).toThrow(TypeError);
-    expect(() => resolveUnderTest('https://example.com:demo')).toThrow(TypeError);
-    expect(() => resolveUnderTest('http://[www.example.com]/')).toThrow(TypeError);
-  });
-});
-
-describe('Mapped using the "imports" key only (no scopes)', () => {
-  it('should fail when the mapping is to an empty array', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "moment": null,
-        "lodash": []
-      }
-    }`);
-
-    expect(() => resolveUnderTest('moment')).toThrow(TypeError);
-    expect(() => resolveUnderTest('lodash')).toThrow(TypeError);
-  });
-
-  describe('Package-like scenarios', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "moment": "/node_modules/moment/src/moment.js",
-        "moment/": "/node_modules/moment/src/",
-        "lodash-dot": "./node_modules/lodash-es/lodash.js",
-        "lodash-dot/": "./node_modules/lodash-es/",
-        "lodash-dotdot": "../node_modules/lodash-es/lodash.js",
-        "lodash-dotdot/": "../node_modules/lodash-es/",
-        "nowhere/": []
-      }
-    }`);
-
-    it('should work for package main modules', () => {
-      expect(resolveUnderTest('moment')).toMatchURL('https://example.com/node_modules/moment/src/moment.js');
-      expect(resolveUnderTest('lodash-dot')).toMatchURL('https://example.com/app/node_modules/lodash-es/lodash.js');
-      expect(resolveUnderTest('lodash-dotdot')).toMatchURL('https://example.com/node_modules/lodash-es/lodash.js');
-    });
-
-    it('should work for package submodules', () => {
-      expect(resolveUnderTest('moment/foo')).toMatchURL('https://example.com/node_modules/moment/src/foo');
-      expect(resolveUnderTest('lodash-dot/foo')).toMatchURL('https://example.com/app/node_modules/lodash-es/foo');
-      expect(resolveUnderTest('lodash-dotdot/foo')).toMatchURL('https://example.com/node_modules/lodash-es/foo');
-    });
-
-    it('should work for package names that end in a slash by just passing through', () => {
-      // TODO: is this the right behavior, or should we throw?
-      expect(resolveUnderTest('moment/')).toMatchURL('https://example.com/node_modules/moment/src/');
-    });
-
-    it('should still fail for package modules that are not declared', () => {
-      expect(() => resolveUnderTest('underscore/')).toThrow(TypeError);
-      expect(() => resolveUnderTest('underscore/foo')).toThrow(TypeError);
-    });
-
-    it('should fail for package submodules that map to nowhere', () => {
-      expect(() => resolveUnderTest('nowhere/foo')).toThrow(TypeError);
-    });
-  });
-
-  describe('Tricky specifiers', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "package/withslash": "/node_modules/package-with-slash/index.mjs",
-        "not-a-package": "/lib/not-a-package.mjs",
-        ".": "/lib/dot.mjs",
-        "..": "/lib/dotdot.mjs",
-        "..\\\\": "/lib/dotdotbackslash.mjs",
-        "%2E": "/lib/percent2e.mjs",
-        "%2F": "/lib/percent2f.mjs"
-      }
-    }`);
-
-    it('should work for explicitly-mapped specifiers that happen to have a slash', () => {
-      expect(resolveUnderTest('package/withslash')).toMatchURL('https://example.com/node_modules/package-with-slash/index.mjs');
-    });
-
-    it('should work when the specifier has punctuation', () => {
-      expect(resolveUnderTest('.')).toMatchURL('https://example.com/lib/dot.mjs');
-      expect(resolveUnderTest('..')).toMatchURL('https://example.com/lib/dotdot.mjs');
-      expect(resolveUnderTest('..\\')).toMatchURL('https://example.com/lib/dotdotbackslash.mjs');
-      expect(resolveUnderTest('%2E')).toMatchURL('https://example.com/lib/percent2e.mjs');
-      expect(resolveUnderTest('%2F')).toMatchURL('https://example.com/lib/percent2f.mjs');
-    });
-
-    it('should fail for attempting to get a submodule of something not declared with a trailing slash', () => {
-      expect(() => resolveUnderTest('not-a-package/foo')).toThrow(TypeError);
-    });
-  });
-
-  describe('URL-like specifiers', () => {
-    const resolveUnderTest = makeResolveUnderTest(`{
-      "imports": {
-        "/node_modules/als-polyfill/index.mjs": "std:kv-storage",
-
-        "/lib/foo.mjs": "./more/bar.mjs",
-        "./dotrelative/foo.mjs": "/lib/dot.mjs",
-        "../dotdotrelative/foo.mjs": "/lib/dotdot.mjs",
-
-        "/lib/no.mjs": null,
-        "./dotrelative/no.mjs": [],
-
-        "/": "/lib/slash-only/",
-        "./": "/lib/dotslash-only/",
-
-        "/test/": "/lib/url-trailing-slash/",
-        "./test/": "/lib/url-trailing-slash-dot/",
-
-        "/test": "/lib/test1.mjs",
-        "../test": "/lib/test2.mjs"
-      }
-    }`);
-
-    it('should remap to other URLs', () => {
-      expect(resolveUnderTest('https://example.com/lib/foo.mjs')).toMatchURL('https://example.com/app/more/bar.mjs');
-      expect(resolveUnderTest('https://///example.com/lib/foo.mjs')).toMatchURL('https://example.com/app/more/bar.mjs');
-      expect(resolveUnderTest('/lib/foo.mjs')).toMatchURL('https://example.com/app/more/bar.mjs');
-
-      expect(resolveUnderTest('https://example.com/app/dotrelative/foo.mjs')).toMatchURL('https://example.com/lib/dot.mjs');
-      expect(resolveUnderTest('../app/dotrelative/foo.mjs')).toMatchURL('https://example.com/lib/dot.mjs');
-
-      expect(resolveUnderTest('https://example.com/dotdotrelative/foo.mjs')).toMatchURL('https://example.com/lib/dotdot.mjs');
-      expect(resolveUnderTest('../dotdotrelative/foo.mjs')).toMatchURL('https://example.com/lib/dotdot.mjs');
-    });
-
-    it('should fail for URLs that remap to empty arrays', () => {
-      expect(() => resolveUnderTest('https://example.com/lib/no.mjs')).toThrow(TypeError);
-      expect(() => resolveUnderTest('/lib/no.mjs')).toThrow(TypeError);
-      expect(() => resolveUnderTest('../lib/no.mjs')).toThrow(TypeError);
-
-      expect(() => resolveUnderTest('https://example.com/app/dotrelative/no.mjs')).toThrow(TypeError);
-      expect(() => resolveUnderTest('/app/dotrelative/no.mjs')).toThrow(TypeError);
-      expect(() => resolveUnderTest('../app/dotrelative/no.mjs')).toThrow(TypeError);
-    });
-
-    it('should remap URLs that are just composed from / and .', () => {
-      expect(resolveUnderTest('https://example.com/')).toMatchURL('https://example.com/lib/slash-only/');
-      expect(resolveUnderTest('/')).toMatchURL('https://example.com/lib/slash-only/');
-      expect(resolveUnderTest('../')).toMatchURL('https://example.com/lib/slash-only/');
-
-      expect(resolveUnderTest('https://example.com/app/')).toMatchURL('https://example.com/lib/dotslash-only/');
-      expect(resolveUnderTest('/app/')).toMatchURL('https://example.com/lib/dotslash-only/');
-      expect(resolveUnderTest('../app/')).toMatchURL('https://example.com/lib/dotslash-only/');
-    });
-
-    it('should remap URLs that are prefix-matched by keys with trailing slashes', () => {
-      expect(resolveUnderTest('/test/foo.mjs')).toMatchURL('https://example.com/lib/url-trailing-slash/foo.mjs');
-      expect(resolveUnderTest('https://example.com/app/test/foo.mjs')).toMatchURL('https://example.com/lib/url-trailing-slash-dot/foo.mjs');
-    });
-
-    it('should use the last entry\'s address when URL-like specifiers parse to the same absolute URL', () => {
-      expect(resolveUnderTest('/test')).toMatchURL('https://example.com/lib/test2.mjs');
-    });
-  });
-
-  describe('Overlapping entries with trailing slashes', () => {
-    it('should favor the most-specific key (no empty arrays)', () => {
-      const resolveUnderTest = makeResolveUnderTest(`{
-        "imports": {
-          "a": "/1",
-          "a/": "/2/",
-          "a/b": "/3",
-          "a/b/": "/4/"
-        }
-      }`);
-
-      expect(resolveUnderTest('a')).toMatchURL('https://example.com/1');
-      expect(resolveUnderTest('a/')).toMatchURL('https://example.com/2/');
-      expect(resolveUnderTest('a/b')).toMatchURL('https://example.com/3');
-      expect(resolveUnderTest('a/b/')).toMatchURL('https://example.com/4/');
-      expect(resolveUnderTest('a/b/c')).toMatchURL('https://example.com/4/c');
-    });
-
-    it('should favor the most-specific key when empty arrays are involved for less-specific keys', () => {
-      const resolveUnderTest = makeResolveUnderTest(`{
-        "imports": {
-          "a": [],
-          "a/": [],
-          "a/b": "/3",
-          "a/b/": "/4/"
-        }
-      }`);
-
-      expect(() => resolveUnderTest('a')).toThrow(TypeError);
-      expect(() => resolveUnderTest('a/')).toThrow(TypeError);
-      expect(() => resolveUnderTest('a/x')).toThrow(TypeError);
-      expect(resolveUnderTest('a/b')).toMatchURL('https://example.com/3');
-      expect(resolveUnderTest('a/b/')).toMatchURL('https://example.com/4/');
-      expect(resolveUnderTest('a/b/c')).toMatchURL('https://example.com/4/c');
-      expect(() => resolveUnderTest('a/x/c')).toThrow(TypeError);
-    });
-
-    it('should favor the most-specific key when empty arrays are involved for more-specific keys', () => {
-      const resolveUnderTest = makeResolveUnderTest(`{
-        "imports": {
-          "a": "/1",
-          "a/": "/2/",
-          "a/b": [],
-          "a/b/": []
-        }
-      }`);
-
-      expect(resolveUnderTest('a')).toMatchURL('https://example.com/1');
-      expect(resolveUnderTest('a/')).toMatchURL('https://example.com/2/');
-      expect(resolveUnderTest('a/x')).toMatchURL('https://example.com/2/x');
-      expect(() => resolveUnderTest('a/b')).toThrow(TypeError);
-      expect(() => resolveUnderTest('a/b/')).toThrow(TypeError);
-      expect(() => resolveUnderTest('a/b/c')).toThrow(TypeError);
-      expect(resolveUnderTest('a/x/c')).toMatchURL('https://example.com/2/x/c');
-    });
-  });
-});
diff --git a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/static-import.py b/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/static-import.py
deleted file mode 100644
index 8d0f5d9f420..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/builtin-support.tentative/static-import.py
+++ /dev/null
@@ -1,5 +0,0 @@
-def main(request, response):
-    return (
-        (('Content-Type', 'text/javascript'),),
-        'import "{}";\n'.format(request.GET.first('url'))
-    )
diff --git a/tests/wpt/web-platform-tests/import-maps/resources/jest-test-helper.js b/tests/wpt/web-platform-tests/import-maps/resources/jest-test-helper.js
deleted file mode 100644
index 752c987df52..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/resources/jest-test-helper.js
+++ /dev/null
@@ -1,132 +0,0 @@
-// Hacky glue code to run Jest-based tests as WPT tests.
-// TODO(https://github.com/WICG/import-maps/issues/170): Consider better ways
-// to write and run tests.
-
-setup({allow_uncaught_exception : true});
-
-const exports = {};
-
-function require(name) {
-  return Object.assign({
-    'URL': URL,
-    'parseFromString': parseFromString,
-    'resolve': resolve,
-    'BUILT_IN_MODULE_SCHEME': 'std'
-  }, exports);
-}
-
-// Sort keys and then stringify for comparison.
-function stringifyImportMap(importMap) {
-  function getKeys(m) {
-    if (typeof m !== 'object')
-      return [];
-
-    let keys = [];
-    for (const key in m) {
-      keys.push(key);
-      keys = keys.concat(getKeys(m[key]));
-    }
-    return keys;
-  }
-  return JSON.stringify(importMap, getKeys(importMap).sort());
-}
-
-function expect(v) {
-  return {
-    toMatchURL: expected => assert_equals(v, expected),
-    toThrow: expected => {
-      if (v.localName === 'iframe') {
-        // `v` is the result of parseFromString(), and thus toThrow()
-        // should be examining the error in that iframe.
-        assert_throws_js(v.contentWindow[expected], () => { throw v.contentWindow.windowError });
-      } else if (expected.test && expected.test('not yet implemented')) {
-        // We override /not yet implemented/ expectation.
-        assert_throws_js(TypeError, v);
-      } else {
-        assert_throws_js(expected, v);
-      }
-    },
-    toEqual: expected => {
-      if (v.localName === 'iframe') {
-        // `v` is the result of parseFromString(), and thus toEqual() is
-        // expected to compare parsed import maps.
-        // We sort keys when stringifying for normalization.
-        const actualParsedImportMap = JSON.parse(
-            internals.getParsedImportMap(v.contentDocument));
-        assert_equals(
-          stringifyImportMap(actualParsedImportMap),
-          stringifyImportMap(expected)
-        );
-      } else {
-        assert_object_equals(v, expected);
-      }
-    }
-  };
-}
-
-expect.toMatchURL = expected => expected;
-
-const test_harness_test = test;
-test = it;
-
-let current_message = '';
-function describe(message, f) {
-  const old = current_message;
-  if (current_message !== '') {
-    current_message += ' / ';
-  }
-  current_message += message;
-  f();
-  current_message = old;
-}
-function it(message, f) {
-  const old = current_message;
-  if (current_message !== '') {
-    current_message += ' / ';
-  }
-  current_message += message;
-  test_harness_test(t => t.step_func(f)(), current_message);
-  current_message = old;
-}
-
-// Creates a new Document (via <iframe>) and add an inline import map.
-// Currently document.write() is used to make everything synchronous, which
-// is just needed for running the existing Jest-based tests easily.
-function parseFromString(mapString, mapBaseURL) {
-  // We can't test data: base URLs because <base> rejects data: URLs.
-  if (new URL(mapBaseURL).protocol === 'data:') {
-    throw Error('test helper does not support data: base URLs');
-  }
-
-  const iframe = document.createElement('iframe');
-  document.body.appendChild(iframe);
-  iframe.contentDocument.write(`
-    <base href="${mapBaseURL}">
-    <script>
-    var scriptError;
-    var windowError;
-    function onScriptError(event) {
-      scriptError = event.error;
-    }
-    function onWindowError(event) {
-      windowError = event.error;
-      return false;
-    }
-    window.addEventListener('error', onWindowError);
-    </sc` + `ript>
-    <script type="importmap" onerror="onScriptError(event)">
-    ${mapString}
-    </sc` + `ript>
-  `);
-  iframe.contentDocument.close();
-
-  return iframe;
-}
-
-// URL resolution is tested using Chromium's `internals`.
-// TODO(hiroshige): Remove the Chromium-specific dependency.
-function resolve(specifier, map, baseURL) {
-  return internals.resolveModuleSpecifier(specifier,
-                                          baseURL,
-                                          map.contentDocument);
-}
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.keep-scheme.https.html
deleted file mode 100644
index 4d785b21f4a..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.keep-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-classic to cross-http origin and keep-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "keep-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.keep-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.keep-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.keep-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.no-redirect.https.html
deleted file mode 100644
index a704db4d934..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.no-redirect.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-classic to cross-http origin and no-redirect redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "no-redirect",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.no-redirect.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.no-redirect.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.no-redirect.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.swap-scheme.https.html
deleted file mode 100644
index 46a0e267366..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-classic to cross-http origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.swap-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.swap-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-http.swap-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-https.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-https.swap-scheme.https.html
deleted file mode 100644
index 8bc14cb8c85..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-https.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-classic to cross-https origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-https",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-https.swap-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-https.swap-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/cross-https.swap-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/same-http.swap-scheme.https.html
deleted file mode 100644
index 0942ebd3591..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/same-http.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-classic to same-http origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "same-http",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/same-http.swap-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/same-http.swap-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/same-http.swap-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/same-https.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/same-https.swap-scheme.https.html
deleted file mode 100644
index 49b0614511a..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/same-https.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-classic to same-https origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "same-https",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/same-https.swap-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/same-https.swap-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-classic/same-https.swap-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.keep-scheme.https.html
deleted file mode 100644
index 530dbe507a1..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.keep-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-module to cross-http origin and keep-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "keep-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.keep-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.keep-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.keep-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.no-redirect.https.html
deleted file mode 100644
index b716ae6168b..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.no-redirect.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-module to cross-http origin and no-redirect redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "no-redirect",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.no-redirect.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.no-redirect.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.no-redirect.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.swap-scheme.https.html
deleted file mode 100644
index 8696795c4de..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-module to cross-http origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.swap-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.swap-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-http.swap-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-https.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-https.swap-scheme.https.html
deleted file mode 100644
index 12a66d42627..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-https.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-module to cross-https origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-https",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-https.swap-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-https.swap-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/cross-https.swap-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/same-http.swap-scheme.https.html
deleted file mode 100644
index e7cb04810b9..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/same-http.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-module to same-http origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "same-http",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/same-http.swap-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/same-http.swap-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/same-http.swap-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/same-https.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/same-https.swap-scheme.https.html
deleted file mode 100644
index 6601019864b..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/same-https.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-module to same-https origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "same-https",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/same-https.swap-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/same-https.swap-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/sharedworker-module/same-https.swap-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html
deleted file mode 100644
index 8a915c29f9f..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to cross-http origin and keep-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "keep-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html
deleted file mode 100644
index 5aabf759341..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to cross-http origin and no-redirect redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "no-redirect",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html
deleted file mode 100644
index 90c204d7a0d..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to cross-http origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-https.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-https.swap-scheme.https.html
deleted file mode 100644
index cbc740ae387..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-https.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to cross-https origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-https",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-https.swap-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-https.swap-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-https.swap-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html
deleted file mode 100644
index d5f79ad6021..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "same-http",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.swap-scheme.https.html
deleted file mode 100644
index 09ba5bc858e..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-https origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "same-https",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.swap-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.swap-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.swap-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html
deleted file mode 100644
index 69dcfb7e5cb..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to cross-http origin and keep-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "keep-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html
deleted file mode 100644
index 816e3449092..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to cross-http origin and no-redirect redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "no-redirect",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html
deleted file mode 100644
index 9e167de1486..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to cross-http origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-https.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-https.swap-scheme.https.html
deleted file mode 100644
index 700b7dada67..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-https.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to cross-https origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-https",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-https.swap-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-https.swap-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-https.swap-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html
deleted file mode 100644
index f0397f11b69..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "same-http",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.swap-scheme.https.html
deleted file mode 100644
index 74f95a26208..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-https origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "same-https",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.swap-scheme.https.html.headers b/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.swap-scheme.https.html.headers
deleted file mode 100644
index 46e2255e388..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.swap-scheme.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-classic/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-classic/cross-http.no-redirect.https.html
deleted file mode 100644
index 3f17e742c30..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-classic/cross-http.no-redirect.https.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-classic to cross-http origin and no-redirect redirection from https context.">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "no-redirect",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-module/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-module/cross-http.no-redirect.https.html
deleted file mode 100644
index d4717590a42..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/sharedworker-module/cross-http.no-redirect.https.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-module to cross-http origin and no-redirect redirection from https context.">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "no-redirect",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic/cross-http.no-redirect.https.html
deleted file mode 100644
index 36ee4ed56d0..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-classic/cross-http.no-redirect.https.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to cross-http origin and no-redirect redirection from https context.">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "no-redirect",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module/cross-http.no-redirect.https.html
deleted file mode 100644
index 87dd4d87ee0..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/opt-in/worker-module/cross-http.no-redirect.https.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to cross-http origin and no-redirect redirection from https context.">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "no-redirect",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic/cross-http.keep-scheme.https.html
deleted file mode 100644
index 4d785b21f4a..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic/cross-http.keep-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-classic to cross-http origin and keep-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "keep-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic/cross-http.no-redirect.https.html
deleted file mode 100644
index a704db4d934..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic/cross-http.no-redirect.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-classic to cross-http origin and no-redirect redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "no-redirect",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic/cross-http.swap-scheme.https.html
deleted file mode 100644
index 46a0e267366..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic/cross-http.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-classic to cross-http origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic/same-http.swap-scheme.https.html
deleted file mode 100644
index 0942ebd3591..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-classic/same-http.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-classic to same-http origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "same-http",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module/cross-http.keep-scheme.https.html
deleted file mode 100644
index 530dbe507a1..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module/cross-http.keep-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-module to cross-http origin and keep-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "keep-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module/cross-http.no-redirect.https.html
deleted file mode 100644
index b716ae6168b..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module/cross-http.no-redirect.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-module to cross-http origin and no-redirect redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "no-redirect",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module/cross-http.swap-scheme.https.html
deleted file mode 100644
index 8696795c4de..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module/cross-http.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-module to cross-http origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module/same-http.swap-scheme.https.html
deleted file mode 100644
index e7cb04810b9..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/sharedworker-module/same-http.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for sharedworker-module to same-http origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "same-http",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "sharedworker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.keep-scheme.https.html
deleted file mode 100644
index 8a915c29f9f..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.keep-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to cross-http origin and keep-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "keep-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.no-redirect.https.html
deleted file mode 100644
index 5aabf759341..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.no-redirect.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to cross-http origin and no-redirect redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "no-redirect",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.swap-scheme.https.html
deleted file mode 100644
index 90c204d7a0d..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to cross-http origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.swap-scheme.https.html
deleted file mode 100644
index d5f79ad6021..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "same-http",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-classic",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.keep-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.keep-scheme.https.html
deleted file mode 100644
index 69dcfb7e5cb..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.keep-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to cross-http origin and keep-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "keep-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.no-redirect.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.no-redirect.https.html
deleted file mode 100644
index 816e3449092..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.no-redirect.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to cross-http origin and no-redirect redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "no-redirect",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.swap-scheme.https.html
deleted file mode 100644
index 9e167de1486..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to cross-http origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "cross-http",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-http.swap-scheme.https.html b/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-http.swap-scheme.https.html
deleted file mode 100644
index f0397f11b69..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/gen/top.meta/unset/worker-module/same-http.swap-scheme.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by `common/security-features/tools/generate.py --spec mixed-content/` -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and swap-scheme redirection from https context.">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="../../../../generic/test-case.sub.js"></script>
-  </head>
-  <body>
-    <script>
-      TestCase(
-        {
-          "expectation": "blocked",
-          "origin": "same-http",
-          "redirection": "swap-scheme",
-          "source_context_list": [],
-          "source_scheme": "https",
-          "subresource": "worker-module",
-          "subresource_policy_deliveries": []
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/scroll-timeline-phases.tentative.html b/tests/wpt/web-platform-tests/scroll-animations/scroll-timeline-phases.tentative.html
index 0cc4e12864e..48ca749d24d 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/scroll-timeline-phases.tentative.html
+++ b/tests/wpt/web-platform-tests/scroll-animations/scroll-timeline-phases.tentative.html
@@ -20,15 +20,167 @@
 <script>
   'use strict';
 
-  promise_test(async t => {
-    const timeline = createScrollTimeline(t);
-    assert_equals(timeline.phase, "inactive");
-  }, 'Scroll timeline starts in "inactive" phase.');
-
   promise_test(async t => {
     const timeline = createScrollTimeline(t);
     assert_throws_js(TypeError, () => {
       timeline.phase = "after";
     });
   }, 'Setting scroll timeline phase (which is readonly) throws TypeError.');
+
+  const test_cases = {
+    before_start: {
+      name: "before start",
+      scroll_percent: 0.1,
+      timeline_phase: "before"
+    },
+    at_start: {
+      name: "at start",
+      scroll_percent: 0.2,
+      timeline_phase: "active"
+    },
+    in_range: {
+      name: "in range",
+      scroll_percent: 0.5,
+      timeline_phase: "active"
+    },
+    at_end: {
+      name: "at end",
+      scroll_percent: 0.8,
+      timeline_phase: "after"
+    },
+    after_end: {
+      name: "after end",
+      scroll_percent: 0.9,
+      timeline_phase: "after"
+    }
+  }
+
+  for (const test_case_key in test_cases){
+    const test_case = test_cases[test_case_key];
+    test(t => {
+      const timeline = createScrollTimelineWithOffsets(t, "20%", "80%");
+      const scroller = timeline.scrollSource;
+      const maxScroll = scroller.scrollHeight - scroller.clientHeight;
+
+      scroller.scrollTop = test_case.scroll_percent * maxScroll;
+
+      assert_equals(
+        timeline.phase,
+        test_case.timeline_phase,
+        "timeline.phase"
+      );
+    }, "Timeline phase while scroll offset is " + test_case.name);
+  }
+
+  // TODO(crbug.com/1060384): Spec is unclear in this case, revisit this when
+  // desired results have been established.
+  // These test cases are worded strangely because they test an edge case
+  // where startScrollOffset is GREATER THAN endScrollOffset
+  const test_cases_start_offset_greater_than_end_offset = {
+    before_end: {
+      name: "before end",
+      scroll_percent: 0.1,
+      timeline_phase: "before"
+    },
+    at_end: {
+      name: "at end",
+      scroll_percent: 0.2,
+      timeline_phase: "before"
+    },
+    before_start: {
+      name: "before start",
+      scroll_percent: 0.5,
+      timeline_phase: "before"
+    },
+    at_start: {
+      name: "at start",
+      scroll_percent: 0.8,
+      timeline_phase: "after"
+    },
+    after_start: {
+      name: "after start",
+      scroll_percent: 0.9,
+      timeline_phase: "after"
+    }
+  }
+
+  for (const test_case_key in test_cases_start_offset_greater_than_end_offset){
+    const test_case =
+      test_cases_start_offset_greater_than_end_offset[test_case_key];
+    test(t => {
+      const timeline = createScrollTimelineWithOffsets(t, "80%", "20%");
+      const scroller = timeline.scrollSource;
+      const maxScroll = scroller.scrollHeight - scroller.clientHeight;
+
+      scroller.scrollTop = test_case.scroll_percent * maxScroll;
+
+      assert_equals(
+        timeline.phase,
+        test_case.timeline_phase,
+        "timeline.phase"
+      );
+    }, "Timeline phase while start offset is greater than end offset and" +
+    " scroll offset is " + test_case.name);
+  }
+
+  // TODO(crbug.com/1060384): Spec is unclear in this case, revisit this when
+  // desired results have been established.
+  // Test cases where startScrollOffset is EQUAL TO endScrollOffset
+  const test_cases_start_offset_equal_to_end_offset = {
+    before_end: {
+      name: "before start",
+      scroll_percent: 0.3,
+      timeline_phase: "before"
+    },
+    at_end: {
+      name: "at both",
+      scroll_percent: 0.5,
+      timeline_phase: "after"
+    },
+    before_start: {
+      name: "after end",
+      scroll_percent: 0.7,
+      timeline_phase: "after"
+    }
+  }
+
+  for (const test_case_key in test_cases_start_offset_equal_to_end_offset){
+    const test_case =
+      test_cases_start_offset_equal_to_end_offset[test_case_key];
+    test(t => {
+      const timeline = createScrollTimelineWithOffsets(t, "50%", "50%");
+      const scroller = timeline.scrollSource;
+      const maxScroll = scroller.scrollHeight - scroller.clientHeight;
+
+      scroller.scrollTop = test_case.scroll_percent * maxScroll;
+
+      assert_equals(
+        timeline.phase,
+        test_case.timeline_phase,
+        "timeline.phase"
+      );
+    }, "Timeline phase while start offset is equal to end offset and scroll" +
+    " offset is " + test_case.name);
+  }
+
+  test(t => {
+    const timeline = createScrollTimeline(t);
+    const scroller = timeline.scrollSource;
+    // Timeline should be inactive since layout hasn't updated yet
+    assert_equals(timeline.phase, "inactive");
+
+    // Accessing scroller.scrollHeight forces the scroller to update
+    scroller.scrollHeight;
+    assert_equals(timeline.phase, "active");
+
+    // Setting the scroller to display none should make the timeline inactive
+    scroller.style.display = "none"
+
+    // Force another layout
+    scroller.scrollHeight;
+
+    assert_equals(timeline.phase, "inactive");
+  }, 'Scroll timeline starts inactive, can transition to active, and then' +
+  ' back to inactive.');
+
 </script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/scroll-animations/testcommon.js b/tests/wpt/web-platform-tests/scroll-animations/testcommon.js
index ca259688566..ab22ff64835 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/testcommon.js
+++ b/tests/wpt/web-platform-tests/scroll-animations/testcommon.js
@@ -12,6 +12,16 @@ function createScrollTimeline(test) {
   });
 }
 
+function createScrollTimelineWithOffsets(test, startOffset, endOffset) {
+  return new ScrollTimeline({
+    scrollSource: createScroller(test),
+    orientation: "vertical",
+    startScrollOffset: startOffset,
+    endScrollOffset: endOffset,
+    timeRange: 1000
+  });
+}
+
 function createScrollLinkedAnimation(test, timeline) {
   if(timeline === undefined)
     timeline = createScrollTimeline(test);
diff --git a/tests/wpt/web-platform-tests/tools/requirements_mypy.txt b/tests/wpt/web-platform-tests/tools/requirements_mypy.txt
index a478015893d..988ffe84817 100644
--- a/tests/wpt/web-platform-tests/tools/requirements_mypy.txt
+++ b/tests/wpt/web-platform-tests/tools/requirements_mypy.txt
@@ -1,3 +1,3 @@
-mypy==0.761
+mypy==0.770
 mypy-extensions==0.4.3
 typed-ast==1.4.1
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_firefox.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_firefox.txt
index ae729408104..d541a49f3c0 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_firefox.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_firefox.txt
@@ -3,9 +3,9 @@ mozcrash==2.0.0
 mozdownload==1.26.0
 mozinstall==2.0.0
 mozleak==0.2
-moznetwork==0.27
+moznetwork==1.1.0
 mozprocess==1.0.0
-mozprofile==2.4.0
+mozprofile==2.5.0
 mozrunner==7.7.0
-mozversion==2.2.0
+mozversion==2.3.0
 psutil==5.7.0
diff --git a/tests/wpt/web-platform-tests/trust-tokens/trust-token-parameter-validation.tentative.https.html b/tests/wpt/web-platform-tests/trust-tokens/trust-token-parameter-validation.tentative.https.html
new file mode 100644
index 00000000000..c3a612724ee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trust-tokens/trust-token-parameter-validation.tentative.https.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>JavaScript: the Trust Token API Fetch method correctly validates its parameters</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  'use strict';
+
+  test(() => {
+    assert_throws_js(TypeError, () => {
+      new Request('https://example.com', {
+        trustToken: {}
+      });
+    });
+  }, 'Trust Tokens fetches require present `type` values.');
+
+  test(() => {
+    assert_throws_js(TypeError, () => {
+      new Request('https://example.com', {
+        trustToken: {
+          type: "invalid"
+        }
+      });
+    });
+  }, 'Trust Tokens fetches require valid `type` values.');
+
+  test(() => {
+    assert_throws_js(TypeError, () => {
+      new Request('https://example.com', {
+        trustToken: {
+          type: "token-request",
+          signRequestData: "not a member of the signRequestData enum"
+        }
+      });
+    });
+  }, 'Trust Tokens fetches require valid `signRequestData` values, if provided.');
+
+  test(() => {
+    assert_throws_js(TypeError, () => {
+      new Request('https://example.com', {
+        trustToken: {
+          type: "token-request",
+          refreshPolicy: "not a member of the refreshPolicy enum",
+        }
+      });
+    });
+  }, 'Trust Tokens fetches require valid `refreshPolicy:` values, if provided.');
+
+  test(() => {
+    assert_throws_js(TypeError, () => {
+      new Request('https://example.com', {
+        trustToken: {
+          type: "send-srr",
+          issuer: "not a valid URL"
+        }
+      });
+    });
+  }, 'Trust Tokens fetches require valid issuer URLs, if provided.');
+
+  test(() => {
+    assert_throws_js(TypeError, () => {
+      new Request('https://example.com', {
+        trustToken: {
+          type: "send-srr",
+          issuer: "http://not-secure.com"
+        }
+      });
+    });
+  }, 'Trust Tokens fetches require secure issuer URLs, if provided.');
+
+  test(() => {
+    new Request('https://example.com', {
+      trustToken: {
+        type: "send-srr",
+        issuer: "http://localhost"
+      }
+    });
+  }, 'Since localhost URLs are potentially trustworthy, setting an issuer to localhost should succeed.');
+</script>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/DocumentOrShadowRoot/getAnimations.html b/tests/wpt/web-platform-tests/web-animations/interfaces/DocumentOrShadowRoot/getAnimations.html
index f88ad432c1e..67addc05476 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/DocumentOrShadowRoot/getAnimations.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/DocumentOrShadowRoot/getAnimations.html
@@ -13,16 +13,6 @@
 
 const gKeyFrames = { 'marginLeft': ['100px', '200px'] };
 
-async function insert_frame_and_await_load(test, iframe, document) {
-  const eventWatcher = new EventWatcher(test, iframe, ['load']);
-  const event_promise = eventWatcher.wait_for('load');
-
-  document.body.appendChild(iframe);
-  test.add_cleanup(() => { document.body.removeChild(iframe); });
-
-  await event_promise;
-}
-
 test(t => {
   assert_equals(document.getAnimations().length, 0,
                 'getAnimations returns an empty sequence for a document ' +
@@ -78,7 +68,7 @@ test(t => {
 
 promise_test(async t => {
   const iframe = document.createElement('iframe');
-  insert_frame_and_await_load(t, iframe, document)
+  insertFrameAndAwaitLoad(t, iframe, document)
 
   const div = createDiv(t, iframe.contentDocument)
   const effect = new KeyframeEffect(div, null, 100 * MS_PER_SEC);
@@ -98,8 +88,8 @@ promise_test(async t => {
   const iframe1 = document.createElement('iframe');
   const iframe2 = document.createElement('iframe');
 
-  insert_frame_and_await_load(t, iframe1, document);
-  insert_frame_and_await_load(t, iframe2, document);
+  insertFrameAndAwaitLoad(t, iframe1, document);
+  insertFrameAndAwaitLoad(t, iframe2, document);
 
   const div_frame1 = createDiv(t, iframe1.contentDocument)
   const div_main_frame = createDiv(t)
@@ -198,6 +188,20 @@ test(t => {
   );
 }, 'Document.getAnimations() does NOT return animations in shadow trees');
 
+test(t => {
+  const div = createDiv(t);
+  const shadow = div.attachShadow({ mode: 'open' });
+
+  div.animate(gKeyFrames, 100 * MS_PER_SEC)
+
+  assert_array_equals(
+    div.shadowRoot.getAnimations(),
+    [],
+    'getAnimations() called on ShadowRoot does not return animations from'
+    + ' Document'
+  );
+}, 'ShadowRoot.getAnimations() does NOT return animations in parent document');
+
 promise_test(async t => {
   const div = createDiv(t);
   const watcher = EventWatcher(t, div, 'transitionrun');
diff --git a/tests/wpt/web-platform-tests/web-animations/testcommon.js b/tests/wpt/web-platform-tests/web-animations/testcommon.js
index f89cbbaf936..811fe784c26 100644
--- a/tests/wpt/web-platform-tests/web-animations/testcommon.js
+++ b/tests/wpt/web-platform-tests/web-animations/testcommon.js
@@ -180,6 +180,16 @@ function waitForNextFrame() {
   });
 }
 
+async function insertFrameAndAwaitLoad(test, iframe, document) {
+  const eventWatcher = new EventWatcher(test, iframe, ['load']);
+  const event_promise = eventWatcher.wait_for('load');
+
+  document.body.appendChild(iframe);
+  test.add_cleanup(() => { document.body.removeChild(iframe); });
+
+  await event_promise;
+}
+
 // Returns 'matrix()' or 'matrix3d()' function string generated from an array.
 function createMatrixFromArray(array) {
   return (array.length == 16 ? 'matrix3d' : 'matrix') + `(${array.join()})`;
diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/timelines/update-and-send-events-replacement.html b/tests/wpt/web-platform-tests/web-animations/timing-model/timelines/update-and-send-events-replacement.html
index 1391b97a8ae..fced6ead657 100644
--- a/tests/wpt/web-platform-tests/web-animations/timing-model/timelines/update-and-send-events-replacement.html
+++ b/tests/wpt/web-platform-tests/web-animations/timing-model/timelines/update-and-send-events-replacement.html
@@ -988,18 +988,16 @@ promise_test(async t => {
 }, 'Queues all remove events before running them');
 
 promise_test(async t => {
-  const outerIframe = createElement(t, 'iframe');
+  const outerIframe = document.createElement('iframe');
+  insertFrameAndAwaitLoad(t, outerIframe, document);
   outerIframe.width = 10;
   outerIframe.height = 10;
 
-  await new Promise(resolve => outerIframe.addEventListener('load', resolve));
-
-  const innerIframe = createElement(t, 'iframe', outerIframe.contentDocument);
+  const innerIframe = document.createElement('iframe');
+  insertFrameAndAwaitLoad(t, innerIframe, outerIframe.contentDocument);
   innerIframe.width = 10;
   innerIframe.height = 10;
 
-  await new Promise(resolve => innerIframe.addEventListener('load', resolve));
-
   const div = createDiv(t, innerIframe.contentDocument);
 
   const animA = div.animate({ opacity: 1 }, { duration: 1, fill: 'forwards' });
diff --git a/tests/wpt/web-platform-tests/webgpu/framework/version.js b/tests/wpt/web-platform-tests/webgpu/framework/version.js
index f8067d48eeb..0b58dd9b3c4 100644
--- a/tests/wpt/web-platform-tests/webgpu/framework/version.js
+++ b/tests/wpt/web-platform-tests/webgpu/framework/version.js
@@ -1,3 +1,3 @@
 // AUTO-GENERATED - DO NOT EDIT. See tools/gen_version.
 
-export const version = 'ec18cc3262922e7dcdbe70243c6f40606f979144';
+export const version = '84ee597cdeae08bb26e578fc66a35bcf35f633f4';
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/format_info.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/capability_info.js
similarity index 71%
rename from tests/wpt/web-platform-tests/webgpu/suites/cts/format_info.js
rename to tests/wpt/web-platform-tests/webgpu/suites/cts/capability_info.js
index 5d54bbb8c51..10947ee1367 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/format_info.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/capability_info.js
@@ -2,7 +2,9 @@
 * AUTO-GENERATED - DO NOT EDIT. Source: https://github.com/gpuweb/cts
 **/
 
-export const textureFormatInfo =
+import { C } from '../../framework/index.js'; // Textures
+
+export const kTextureFormatInfo =
 /* prettier-ignore */
 {
   // Try to keep these manually-formatted in a readable grid.
@@ -167,36 +169,61 @@ export const textureFormatInfo =
     color: false
   }
 };
-export const textureFormats = Object.keys(textureFormatInfo);
-export const bindingTypeInfo =
+export const kTextureFormats = Object.keys(kTextureFormatInfo); // Bindings
+
+export const kMaxBindingsPerBindGroup = 16;
+export const kPerStageBindingLimits =
+/* prettier-ignore */
+{
+  'uniform-buffer': 12,
+  'storage-buffer': 4,
+  'sampler': 16,
+  'sampled-texture': 16,
+  'storage-texture': 4
+};
+const kStagesAll = C.ShaderStage.Vertex | C.ShaderStage.Fragment | C.ShaderStage.Compute;
+const kStagesNonVertex = C.ShaderStage.Fragment | C.ShaderStage.Compute;
+export const kBindingTypeInfo =
 /* prettier-ignore */
 {
   'uniform-buffer': {
     type: 'buffer',
+    validStages: kStagesAll,
+    perStageLimitType: 'uniform-buffer',
     maxDynamicCount: 8
   },
   'storage-buffer': {
     type: 'buffer',
+    validStages: kStagesNonVertex,
+    perStageLimitType: 'storage-buffer',
     maxDynamicCount: 4
   },
   'readonly-storage-buffer': {
     type: 'buffer',
+    validStages: kStagesAll,
+    perStageLimitType: 'storage-buffer',
     maxDynamicCount: 4
   },
   'sampler': {
     type: 'sampler',
+    validStages: kStagesAll,
+    perStageLimitType: 'sampler',
     maxDynamicCount: 0
   },
   'sampled-texture': {
     type: 'texture',
+    validStages: kStagesAll,
+    perStageLimitType: 'sampled-texture',
     maxDynamicCount: 0
   },
   'storage-texture': {
     type: 'texture',
+    validStages: kStagesAll,
+    perStageLimitType: 'storage-texture',
     maxDynamicCount: 0
   }
 };
-export const bindingTypes = Object.keys(bindingTypeInfo);
-export const shaderStages = [1, 2, 4];
-export const shaderStageCombinations = [0, 1, 2, 3, 4, 5, 6, 7];
-//# sourceMappingURL=format_info.js.map
\ No newline at end of file
+export const kBindingTypes = Object.keys(kBindingTypeInfo);
+export const kShaderStages = [C.ShaderStage.Vertex, C.ShaderStage.Fragment, C.ShaderStage.Compute];
+export const kShaderStageCombinations = [0, 1, 2, 3, 4, 5, 6, 7];
+//# sourceMappingURL=capability_info.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/compute/basic.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/compute/basic.spec.js
index 598edea66ab..536f7a9003e 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/compute/basic.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/compute/basic.spec.js
@@ -66,7 +66,7 @@ g.test('memcpy', async t => {
      *       `
      *     )
      */
-    new Uint32Array([119734787, 66304, 524296, 18, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 327695, 5, 4, 1852399981, 0, 393232, 4, 17, 1, 1, 1, 196611, 1, 310, 262149, 4, 1852399981, 0, 196613, 7, 7631684, 327686, 7, 0, 1970037110, 101, 196613, 9, 7631716, 196613, 11, 6517331, 327686, 11, 0, 1970037110, 101, 196613, 13, 6517363, 327752, 7, 0, 35, 0, 196679, 7, 2, 262215, 9, 34, 0, 262215, 9, 33, 1, 327752, 11, 0, 35, 0, 196679, 11, 2, 262215, 13, 34, 0, 262215, 13, 33, 0, 131091, 2, 196641, 3, 2, 262165, 6, 32, 1, 196638, 7, 6, 262176, 8, 12, 7, 262203, 8, 9, 12, 262187, 6, 10, 0, 196638, 11, 6, 262176, 12, 12, 11, 262203, 12, 13, 12, 262176, 14, 12, 6, 327734, 2, 4, 0, 3, 131320, 5, 327745, 14, 15, 13, 10, 262205, 6, 16, 15, 327745, 14, 17, 9, 10, 196670, 17, 16, 65789, 65592])
+    new Uint32Array([119734787, 65536, 524296, 18, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 327695, 5, 4, 1852399981, 0, 393232, 4, 17, 1, 1, 1, 196611, 1, 310, 262149, 4, 1852399981, 0, 196613, 7, 7631684, 327686, 7, 0, 1970037110, 101, 196613, 9, 7631716, 196613, 11, 6517331, 327686, 11, 0, 1970037110, 101, 196613, 13, 6517363, 327752, 7, 0, 35, 0, 196679, 7, 3, 262215, 9, 34, 0, 262215, 9, 33, 1, 327752, 11, 0, 35, 0, 196679, 11, 3, 262215, 13, 34, 0, 262215, 13, 33, 0, 131091, 2, 196641, 3, 2, 262165, 6, 32, 1, 196638, 7, 6, 262176, 8, 2, 7, 262203, 8, 9, 2, 262187, 6, 10, 0, 196638, 11, 6, 262176, 12, 2, 11, 262203, 12, 13, 2, 262176, 14, 2, 6, 327734, 2, 4, 0, 3, 131320, 5, 327745, 14, 15, 13, 10, 262205, 6, 16, 15, 327745, 14, 17, 9, 10, 196670, 17, 16, 65789, 65592])
   });
   const pl = t.device.createPipelineLayout({
     bindGroupLayouts: [bgl]
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/rendering.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/rendering.spec.js
index 7bb7c546b58..b26b9fbc859 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/rendering.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/rendering.spec.js
@@ -34,7 +34,7 @@ g.test('fullscreen quad', async t => {
      *       `
      *     )
      */
-    new Uint32Array([119734787, 66304, 524296, 39, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 458767, 0, 4, 1852399981, 0, 10, 26, 196611, 1, 310, 262149, 4, 1852399981, 0, 393221, 8, 1348430951, 1700164197, 2019914866, 0, 393222, 8, 0, 1348430951, 1953067887, 7237481, 458758, 8, 1, 1348430951, 1953393007, 1702521171, 0, 196613, 10, 0, 393221, 26, 1449094247, 1702130277, 1684949368, 30821, 327685, 29, 1701080681, 1818386808, 101, 327752, 8, 0, 11, 0, 327752, 8, 1, 11, 1, 196679, 8, 2, 262215, 26, 11, 42, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262174, 8, 7, 6, 262176, 9, 3, 8, 262203, 9, 10, 3, 262165, 11, 32, 1, 262187, 11, 12, 0, 262167, 13, 6, 2, 262165, 14, 32, 0, 262187, 14, 15, 3, 262172, 16, 13, 15, 262187, 6, 17, 3212836864, 262187, 6, 18, 3225419776, 327724, 13, 19, 17, 18, 262187, 6, 20, 1077936128, 262187, 6, 21, 1065353216, 327724, 13, 22, 20, 21, 327724, 13, 23, 17, 21, 393260, 16, 24, 19, 22, 23, 262176, 25, 1, 11, 262203, 25, 26, 1, 262176, 28, 7, 16, 262176, 30, 7, 13, 262187, 6, 33, 0, 262176, 37, 3, 7, 327734, 2, 4, 0, 3, 131320, 5, 262203, 28, 29, 7, 262205, 11, 27, 26, 196670, 29, 24, 327745, 30, 31, 29, 27, 262205, 13, 32, 31, 327761, 6, 34, 32, 0, 327761, 6, 35, 32, 1, 458832, 7, 36, 34, 35, 33, 21, 327745, 37, 38, 10, 12, 196670, 38, 36, 65789, 65592])
+    new Uint32Array([119734787, 65536, 524296, 39, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 458767, 0, 4, 1852399981, 0, 10, 26, 196611, 1, 310, 262149, 4, 1852399981, 0, 393221, 8, 1348430951, 1700164197, 2019914866, 0, 393222, 8, 0, 1348430951, 1953067887, 7237481, 458758, 8, 1, 1348430951, 1953393007, 1702521171, 0, 196613, 10, 0, 393221, 26, 1449094247, 1702130277, 1684949368, 30821, 327685, 29, 1701080681, 1818386808, 101, 327752, 8, 0, 11, 0, 327752, 8, 1, 11, 1, 196679, 8, 2, 262215, 26, 11, 42, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262174, 8, 7, 6, 262176, 9, 3, 8, 262203, 9, 10, 3, 262165, 11, 32, 1, 262187, 11, 12, 0, 262167, 13, 6, 2, 262165, 14, 32, 0, 262187, 14, 15, 3, 262172, 16, 13, 15, 262187, 6, 17, 3212836864, 262187, 6, 18, 3225419776, 327724, 13, 19, 17, 18, 262187, 6, 20, 1077936128, 262187, 6, 21, 1065353216, 327724, 13, 22, 20, 21, 327724, 13, 23, 17, 21, 393260, 16, 24, 19, 22, 23, 262176, 25, 1, 11, 262203, 25, 26, 1, 262176, 28, 7, 16, 262176, 30, 7, 13, 262187, 6, 33, 0, 262176, 37, 3, 7, 327734, 2, 4, 0, 3, 131320, 5, 262203, 28, 29, 7, 262205, 11, 27, 26, 196670, 29, 24, 327745, 30, 31, 29, 27, 262205, 13, 32, 31, 327761, 6, 34, 32, 0, 327761, 6, 35, 32, 1, 458832, 7, 36, 34, 35, 33, 21, 327745, 37, 38, 10, 12, 196670, 38, 36, 65789, 65592])
   });
   const fragmentModule = t.createShaderModule({
     code:
@@ -49,7 +49,7 @@ g.test('fullscreen quad', async t => {
      *       `
      *     )
      */
-    new Uint32Array([119734787, 66304, 524296, 13, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 393231, 4, 4, 1852399981, 0, 9, 196624, 4, 7, 196611, 1, 310, 262149, 4, 1852399981, 0, 327685, 9, 1734439526, 1869377347, 114, 196679, 9, 0, 262215, 9, 30, 0, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262176, 8, 3, 7, 262203, 8, 9, 3, 262187, 6, 10, 0, 262187, 6, 11, 1065353216, 458796, 7, 12, 10, 11, 10, 11, 327734, 2, 4, 0, 3, 131320, 5, 196670, 9, 12, 65789, 65592])
+    new Uint32Array([119734787, 65536, 524296, 13, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 393231, 4, 4, 1852399981, 0, 9, 196624, 4, 7, 196611, 1, 310, 262149, 4, 1852399981, 0, 327685, 9, 1734439526, 1869377347, 114, 196679, 9, 0, 262215, 9, 30, 0, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262176, 8, 3, 7, 262203, 8, 9, 3, 262187, 6, 10, 0, 262187, 6, 11, 1065353216, 458796, 7, 12, 10, 11, 10, 11, 327734, 2, 4, 0, 3, 131320, 5, 196670, 9, 12, 65789, 65592])
   });
   const pl = t.device.createPipelineLayout({
     bindGroupLayouts: []
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/storeop.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/storeop.spec.js
index 5bf6bd0116c..1f758cc5c2e 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/storeop.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/command_buffer/render/storeop.spec.js
@@ -34,7 +34,7 @@ g.test('storeOp controls whether 1x1 drawn quad is stored', async t => {
      *       }`
      *     )
      */
-    new Uint32Array([119734787, 66304, 524296, 39, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 458767, 0, 4, 1852399981, 0, 13, 26, 196611, 2, 450, 262149, 4, 1852399981, 0, 393221, 11, 1348430951, 1700164197, 2019914866, 0, 393222, 11, 0, 1348430951, 1953067887, 7237481, 458758, 11, 1, 1348430951, 1953393007, 1702521171, 0, 458758, 11, 2, 1130327143, 1148217708, 1635021673, 6644590, 458758, 11, 3, 1130327143, 1147956341, 1635021673, 6644590, 196613, 13, 0, 393221, 26, 1449094247, 1702130277, 1684949368, 30821, 327685, 29, 1701080681, 1818386808, 101, 327752, 11, 0, 11, 0, 327752, 11, 1, 11, 1, 327752, 11, 2, 11, 3, 327752, 11, 3, 11, 4, 196679, 11, 2, 262215, 26, 11, 42, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262165, 8, 32, 0, 262187, 8, 9, 1, 262172, 10, 6, 9, 393246, 11, 7, 6, 10, 10, 262176, 12, 3, 11, 262203, 12, 13, 3, 262165, 14, 32, 1, 262187, 14, 15, 0, 262167, 16, 6, 2, 262187, 8, 17, 3, 262172, 18, 16, 17, 262187, 6, 19, 1065353216, 262187, 6, 20, 3212836864, 327724, 16, 21, 19, 20, 327724, 16, 22, 19, 19, 327724, 16, 23, 20, 19, 393260, 18, 24, 21, 22, 23, 262176, 25, 1, 14, 262203, 25, 26, 1, 262176, 28, 7, 18, 262176, 30, 7, 16, 262187, 6, 33, 0, 262176, 37, 3, 7, 327734, 2, 4, 0, 3, 131320, 5, 262203, 28, 29, 7, 262205, 14, 27, 26, 196670, 29, 24, 327745, 30, 31, 29, 27, 262205, 16, 32, 31, 327761, 6, 34, 32, 0, 327761, 6, 35, 32, 1, 458832, 7, 36, 34, 35, 33, 19, 327745, 37, 38, 13, 15, 196670, 38, 36, 65789, 65592])
+    new Uint32Array([119734787, 65536, 524296, 39, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 458767, 0, 4, 1852399981, 0, 13, 26, 196611, 2, 450, 262149, 4, 1852399981, 0, 393221, 11, 1348430951, 1700164197, 2019914866, 0, 393222, 11, 0, 1348430951, 1953067887, 7237481, 458758, 11, 1, 1348430951, 1953393007, 1702521171, 0, 458758, 11, 2, 1130327143, 1148217708, 1635021673, 6644590, 458758, 11, 3, 1130327143, 1147956341, 1635021673, 6644590, 196613, 13, 0, 393221, 26, 1449094247, 1702130277, 1684949368, 30821, 327685, 29, 1701080681, 1818386808, 101, 327752, 11, 0, 11, 0, 327752, 11, 1, 11, 1, 327752, 11, 2, 11, 3, 327752, 11, 3, 11, 4, 196679, 11, 2, 262215, 26, 11, 42, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262165, 8, 32, 0, 262187, 8, 9, 1, 262172, 10, 6, 9, 393246, 11, 7, 6, 10, 10, 262176, 12, 3, 11, 262203, 12, 13, 3, 262165, 14, 32, 1, 262187, 14, 15, 0, 262167, 16, 6, 2, 262187, 8, 17, 3, 262172, 18, 16, 17, 262187, 6, 19, 1065353216, 262187, 6, 20, 3212836864, 327724, 16, 21, 19, 20, 327724, 16, 22, 19, 19, 327724, 16, 23, 20, 19, 393260, 18, 24, 21, 22, 23, 262176, 25, 1, 14, 262203, 25, 26, 1, 262176, 28, 7, 18, 262176, 30, 7, 16, 262187, 6, 33, 0, 262176, 37, 3, 7, 327734, 2, 4, 0, 3, 131320, 5, 262203, 28, 29, 7, 262205, 14, 27, 26, 196670, 29, 24, 327745, 30, 31, 29, 27, 262205, 16, 32, 31, 327761, 6, 34, 32, 0, 327761, 6, 35, 32, 1, 458832, 7, 36, 34, 35, 33, 19, 327745, 37, 38, 13, 15, 196670, 38, 36, 65789, 65592])
   });
   const fragmentModule = t.createShaderModule({
     code:
@@ -47,7 +47,7 @@ g.test('storeOp controls whether 1x1 drawn quad is stored', async t => {
      *       }`
      *     )
      */
-    new Uint32Array([119734787, 66304, 524296, 13, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 393231, 4, 4, 1852399981, 0, 9, 196624, 4, 7, 196611, 2, 450, 262149, 4, 1852399981, 0, 327685, 9, 1734439526, 1869377347, 114, 262215, 9, 30, 0, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262176, 8, 3, 7, 262203, 8, 9, 3, 262187, 6, 10, 1065353216, 262187, 6, 11, 0, 458796, 7, 12, 10, 11, 11, 10, 327734, 2, 4, 0, 3, 131320, 5, 196670, 9, 12, 65789, 65592])
+    new Uint32Array([119734787, 65536, 524296, 13, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 393231, 4, 4, 1852399981, 0, 9, 196624, 4, 7, 196611, 2, 450, 262149, 4, 1852399981, 0, 327685, 9, 1734439526, 1869377347, 114, 262215, 9, 30, 0, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262176, 8, 3, 7, 262203, 8, 9, 3, 262187, 6, 10, 1065353216, 262187, 6, 11, 0, 458796, 7, 12, 10, 11, 11, 10, 327734, 2, 4, 0, 3, 131320, 5, 196670, 9, 12, 65789, 65592])
   });
   const renderPipeline = t.device.createRenderPipeline({
     vertexStage: {
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/copyImageBitmapToTexture.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/copyImageBitmapToTexture.spec.js
index b201bb49750..42ad8507ec9 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/copyImageBitmapToTexture.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/copyImageBitmapToTexture.spec.js
@@ -5,7 +5,7 @@
 export const description = `
 copy imageBitmap To texture tests.
 `;
-import { TestGroup, assert, pcombine, poptions } from '../../framework/index.js';
+import { TestGroup, pcombine, poptions } from '../../framework/index.js';
 import { GPUTest } from './gpu_test.js';
 
 function calculateRowPitch(width, bytesPerPixel) {
@@ -60,17 +60,37 @@ class F extends GPUTest {
     }
 
     return failedPixels > 0 ? lines.join('\n') : undefined;
-  } // Using drawImage to extract imageBitmap content.
+  }
 
-
-  imageBitmapToData(imageBitmap) {
-    const imageCanvas = document.createElement('canvas');
-    imageCanvas.width = imageBitmap.width;
-    imageCanvas.height = imageBitmap.height;
-    const imageCanvasContext = imageCanvas.getContext('2d');
-    assert(imageCanvasContext !== null, 'Cannot create canvas context for reading back contents from imageBitmap.');
-    imageCanvasContext.drawImage(imageBitmap, 0, 0, imageBitmap.width, imageBitmap.height);
-    return imageCanvasContext.getImageData(0, 0, imageBitmap.width, imageBitmap.height).data;
+  doTestAndCheckResult(imageBitmapCopyView, dstTextureCopyView, copySize, bytesPerPixel, expectedData) {
+    this.device.defaultQueue.copyImageBitmapToTexture(imageBitmapCopyView, dstTextureCopyView, copySize);
+    const imageBitmap = imageBitmapCopyView.imageBitmap;
+    const dstTexture = dstTextureCopyView.texture;
+    const rowPitchValue = calculateRowPitch(imageBitmap.width, bytesPerPixel);
+    const testBuffer = this.device.createBuffer({
+      size: rowPitchValue * imageBitmap.height,
+      usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST
+    });
+    const encoder = this.device.createCommandEncoder();
+    encoder.copyTextureToBuffer({
+      texture: dstTexture,
+      mipLevel: 0,
+      origin: {
+        x: 0,
+        y: 0,
+        z: 0
+      }
+    }, {
+      buffer: testBuffer,
+      rowPitch: rowPitchValue,
+      imageHeight: 0
+    }, {
+      width: imageBitmap.width,
+      height: imageBitmap.height,
+      depth: 1
+    });
+    this.device.defaultQueue.submit([encoder.finish()]);
+    this.checkCopyImageBitmapResult(testBuffer, expectedData, imageBitmap.width, imageBitmap.height, bytesPerPixel);
   }
 
 }
@@ -97,10 +117,10 @@ g.test('from ImageData', async t => {
       height: imageBitmap.height,
       depth: 1
     },
-    format: 'rgba8uint',
+    format: 'rgba8unorm',
     usage: GPUTextureUsage.COPY_DST | GPUTextureUsage.COPY_SRC
   });
-  t.device.defaultQueue.copyImageBitmapToTexture({
+  t.doTestAndCheckResult({
     imageBitmap,
     origin: {
       x: 0,
@@ -112,33 +132,74 @@ g.test('from ImageData', async t => {
     width: imageBitmap.width,
     height: imageBitmap.height,
     depth: 1
+  }, bytesPerPixel, imagePixels);
+}).params(pcombine(poptions('width', [1, 2, 4, 15, 255, 256]), //
+poptions('height', [1, 2, 4, 15, 255, 256])));
+g.test('from canvas', async t => {
+  const {
+    width,
+    height
+  } = t.params; // CTS sometimes runs on worker threads, where document is not available.
+  // In this case, OffscreenCanvas can be used instead of <canvas>.
+  // But some browsers don't support OffscreenCanvas, and some don't
+  // support '2d' contexts on OffscreenCanvas.
+  // In this situation, the case will be skipped.
+
+  let imageCanvas;
+
+  if (typeof document !== 'undefined') {
+    imageCanvas = document.createElement('canvas');
+    imageCanvas.width = width;
+    imageCanvas.height = height;
+  } else if (typeof OffscreenCanvas === 'undefined') {
+    t.skip('OffscreenCanvas is not supported');
+    return;
+  } else {
+    imageCanvas = new OffscreenCanvas(width, height);
+  }
+
+  const imageCanvasContext = imageCanvas.getContext('2d');
+
+  if (imageCanvasContext === null) {
+    t.skip('OffscreenCanvas "2d" context not available');
+    return;
+  } // The texture format is rgba8uint, so the bytes per pixel is 4.
+
+
+  const bytesPerPixel = 4; // Generate original data.
+
+  const imagePixels = new Uint8ClampedArray(bytesPerPixel * width * height);
+
+  for (let i = 0; i < width * height * bytesPerPixel; ++i) {
+    imagePixels[i] = i % 256;
+  }
+
+  const imageData = new ImageData(imagePixels, width, height);
+  imageCanvasContext.putImageData(imageData, 0, 0);
+  const imageBitmap = await createImageBitmap(imageCanvas);
+  const dst = t.device.createTexture({
+    size: {
+      width: imageBitmap.width,
+      height: imageBitmap.height,
+      depth: 1
+    },
+    format: 'rgba8unorm',
+    usage: GPUTextureUsage.COPY_DST | GPUTextureUsage.COPY_SRC
   });
-  const data = t.imageBitmapToData(imageBitmap);
-  const rowPitchValue = calculateRowPitch(imageBitmap.width, bytesPerPixel);
-  const testBuffer = t.device.createBuffer({
-    size: rowPitchValue * imageBitmap.height,
-    usage: GPUBufferUsage.COPY_SRC | GPUBufferUsage.COPY_DST
-  });
-  const encoder = t.device.createCommandEncoder();
-  encoder.copyTextureToBuffer({
-    texture: dst,
-    mipLevel: 0,
+  const expectedData = imageCanvasContext.getImageData(0, 0, imageBitmap.width, imageBitmap.height).data;
+  t.doTestAndCheckResult({
+    imageBitmap,
     origin: {
       x: 0,
-      y: 0,
-      z: 0
+      y: 0
     }
   }, {
-    buffer: testBuffer,
-    rowPitch: rowPitchValue,
-    imageHeight: 0
+    texture: dst
   }, {
     width: imageBitmap.width,
     height: imageBitmap.height,
     depth: 1
-  });
-  t.device.defaultQueue.submit([encoder.finish()]);
-  t.checkCopyImageBitmapResult(testBuffer, data, imageBitmap.width, imageBitmap.height, bytesPerPixel);
+  }, bytesPerPixel, expectedData);
 }).params(pcombine(poptions('width', [1, 2, 4, 15, 255, 256]), //
 poptions('height', [1, 2, 4, 15, 255, 256])));
 //# sourceMappingURL=copyImageBitmapToTexture.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/gpu_test.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/gpu_test.js
index 236e9eaeb9d..7ab5320d6e9 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/gpu_test.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/gpu_test.js
@@ -7,6 +7,48 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import { getGPU } from '../../framework/gpu/implementation.js';
 import { Fixture, assert, unreachable } from '../../framework/index.js';
 let glslangInstance;
+
+class DevicePool {
+  constructor() {
+    _defineProperty(this, "device", undefined);
+
+    _defineProperty(this, "state", 'uninitialized');
+  }
+
+  async initialize() {
+    try {
+      const gpu = getGPU();
+      const adapter = await gpu.requestAdapter();
+      this.device = await adapter.requestDevice();
+    } catch (ex) {
+      this.state = 'failed';
+      throw ex;
+    }
+  }
+
+  async acquire() {
+    assert(this.state !== 'acquired', 'Device was in use');
+    assert(this.state !== 'failed', 'Failed to initialize WebGPU device');
+    const state = this.state;
+    this.state = 'acquired';
+
+    if (state === 'uninitialized') {
+      await this.initialize();
+    }
+
+    assert(!!this.device);
+    return this.device;
+  }
+
+  release(device) {
+    assert(this.state === 'acquired');
+    assert(device === this.device, 'Released device was the wrong device');
+    this.state = 'free';
+  }
+
+}
+
+const devicePool = new DevicePool();
 export class GPUTest extends Fixture {
   constructor(...args) {
     super(...args);
@@ -21,10 +63,8 @@ export class GPUTest extends Fixture {
   }
 
   async init() {
-    super.init();
-    const gpu = getGPU();
-    const adapter = await gpu.requestAdapter();
-    this.device = await adapter.requestDevice();
+    await super.init();
+    this.device = await devicePool.acquire();
     this.queue = this.device.defaultQueue;
     const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
 
@@ -43,7 +83,7 @@ export class GPUTest extends Fixture {
   }
 
   async finalize() {
-    super.finalize();
+    await super.finalize();
 
     if (this.initialized) {
       const gpuValidationError = await this.device.popErrorScope();
@@ -60,6 +100,10 @@ export class GPUTest extends Fixture {
         this.fail('Unexpected out-of-memory error occurred');
       }
     }
+
+    if (this.device) {
+      devicePool.release(this.device);
+    }
   }
 
   async initGLSL() {
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/resource_init/sampled_texture_clear.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/resource_init/sampled_texture_clear.spec.js
index 66cee08addd..a8fb1ad71d1 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/resource_init/sampled_texture_clear.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/resource_init/sampled_texture_clear.spec.js
@@ -54,7 +54,7 @@ g.test('compute pass test that sampled texture is cleared', async t => {
      *       }`
      *     )
      */
-    new Uint32Array([119734787, 66304, 524296, 29, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 327695, 5, 4, 1852399981, 0, 393232, 4, 17, 1, 1, 1, 196611, 2, 450, 262149, 4, 1852399981, 0, 327685, 8, 1717990722, 1700033125, 120, 327686, 8, 0, 1970496882, 29804, 327685, 10, 1717990754, 1700033125, 120, 327685, 15, 1886216563, 1700029804, 120, 327685, 19, 1886216563, 812803436, 0, 327752, 8, 0, 35, 0, 196679, 8, 2, 262215, 10, 34, 0, 262215, 10, 33, 1, 262215, 15, 34, 0, 262215, 15, 33, 0, 262215, 19, 34, 0, 262215, 19, 33, 2, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 196638, 8, 7, 262176, 9, 12, 8, 262203, 9, 10, 12, 262165, 11, 32, 1, 262187, 11, 12, 0, 589849, 13, 6, 1, 0, 0, 0, 1, 0, 262176, 14, 0, 13, 262203, 14, 15, 0, 131098, 17, 262176, 18, 0, 17, 262203, 18, 19, 0, 196635, 21, 13, 262167, 23, 11, 2, 327724, 23, 24, 12, 12, 262176, 27, 12, 7, 327734, 2, 4, 0, 3, 131320, 5, 262205, 13, 16, 15, 262205, 17, 20, 19, 327766, 21, 22, 16, 20, 262244, 13, 25, 22, 458847, 7, 26, 25, 24, 2, 12, 327745, 27, 28, 10, 12, 196670, 28, 26, 65789, 65592])
+    new Uint32Array([119734787, 65536, 524296, 29, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 327695, 5, 4, 1852399981, 0, 393232, 4, 17, 1, 1, 1, 196611, 2, 450, 262149, 4, 1852399981, 0, 327685, 8, 1717990722, 1700033125, 120, 327686, 8, 0, 1970496882, 29804, 327685, 10, 1717990754, 1700033125, 120, 327685, 15, 1886216563, 1700029804, 120, 327685, 19, 1886216563, 812803436, 0, 327752, 8, 0, 35, 0, 196679, 8, 3, 262215, 10, 34, 0, 262215, 10, 33, 1, 262215, 15, 34, 0, 262215, 15, 33, 0, 262215, 19, 34, 0, 262215, 19, 33, 2, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 196638, 8, 7, 262176, 9, 2, 8, 262203, 9, 10, 2, 262165, 11, 32, 1, 262187, 11, 12, 0, 589849, 13, 6, 1, 0, 0, 0, 1, 0, 262176, 14, 0, 13, 262203, 14, 15, 0, 131098, 17, 262176, 18, 0, 17, 262203, 18, 19, 0, 196635, 21, 13, 262167, 23, 11, 2, 327724, 23, 24, 12, 12, 262176, 27, 2, 7, 327734, 2, 4, 0, 3, 131320, 5, 262205, 13, 16, 15, 262205, 17, 20, 19, 327766, 21, 22, 16, 20, 262244, 13, 25, 22, 458847, 7, 26, 25, 24, 2, 12, 327745, 27, 28, 10, 12, 196670, 28, 26, 65789, 65592])
   });
   const pipelineLayout = t.device.createPipelineLayout({
     bindGroupLayouts: [bindGroupLayout]
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createBindGroup.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createBindGroup.spec.js
index 22472f8dff2..2f42a8b643d 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createBindGroup.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createBindGroup.spec.js
@@ -6,7 +6,7 @@ export const description = `
 createBindGroup validation tests.
 `;
 import { C, TestGroup, pcombine, poptions, unreachable } from '../../../framework/index.js';
-import { bindingTypes } from '../format_info.js';
+import { kBindingTypes } from '../capability_info.js';
 import { BindingResourceType, ValidationTest, resourceBindingMatches } from './validation_test.js';
 
 function clone(descriptor) {
@@ -107,7 +107,7 @@ g.test('buffer binding must contain exactly one buffer of its type', t => {
       }]
     });
   }, shouldError);
-}).params(pcombine(poptions('bindingType', bindingTypes), poptions('resourceType', Object.keys(BindingResourceType))));
+}).params(pcombine(poptions('bindingType', kBindingTypes), poptions('resourceType', Object.keys(BindingResourceType))));
 g.test('texture binding must have correct usage', async t => {
   const type = t.params.type;
   const usage = t.params._usage;
@@ -389,11 +389,6 @@ g.test('buffer offset and size for bind groups match', async t => {
   offset: 1024,
   size: 1,
   _success: false
-}, // offset+size is OOB
-{
-  offset: 256,
-  size: -256,
-  _success: false
-} // offset+size overflows to be 0
+} // offset+size is OOB
 ]);
 //# sourceMappingURL=createBindGroup.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createBindGroupLayout.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createBindGroupLayout.spec.js
index 22fa8f5d606..b48db9598dd 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createBindGroupLayout.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createBindGroupLayout.spec.js
@@ -6,7 +6,7 @@ export const description = `
 createBindGroupLayout validation tests.
 `;
 import { C, TestGroup, poptions } from '../../../framework/index.js';
-import { bindingTypeInfo, bindingTypes } from '../format_info.js';
+import { kBindingTypeInfo, kBindingTypes, kMaxBindingsPerBindGroup, kPerStageBindingLimits, kShaderStages } from '../capability_info.js';
 import { ValidationTest } from './validation_test.js';
 
 function clone(descriptor) {
@@ -35,23 +35,6 @@ g.test('some binding index was specified more than once', async t => {
     t.device.createBindGroupLayout(badDescriptor);
   });
 });
-g.test('negative binding index', async t => {
-  const goodDescriptor = {
-    bindings: [{
-      binding: 0,
-      visibility: GPUShaderStage.COMPUTE,
-      type: C.BindingType.StorageBuffer
-    }]
-  }; // Control case
-
-  t.device.createBindGroupLayout(goodDescriptor); // Negative binding index can't be specified.
-
-  const badDescriptor = clone(goodDescriptor);
-  badDescriptor.bindings[0].binding = -1;
-  t.expectValidationError(() => {
-    t.device.createBindGroupLayout(badDescriptor);
-  });
-});
 g.test('Visibility of bindings can be 0', async t => {
   t.device.createBindGroupLayout({
     bindings: [{
@@ -102,7 +85,7 @@ g.test('number of dynamic buffers exceeds the maximum value', async t => {
 }]);
 g.test('dynamic set to true is allowed only for buffers', async t => {
   const type = t.params.type;
-  const success = bindingTypeInfo[type].type === 'buffer';
+  const success = kBindingTypeInfo[type].type === 'buffer';
   const descriptor = {
     bindings: [{
       binding: 0,
@@ -114,5 +97,133 @@ g.test('dynamic set to true is allowed only for buffers', async t => {
   t.expectValidationError(() => {
     t.device.createBindGroupLayout(descriptor);
   }, !success);
-}).params(poptions('type', bindingTypes));
+}).params(poptions('type', kBindingTypes));
+let kCasesForMaxResourcesPerStageTests;
+{
+  // One bind group layout will be filled with kPerStageBindingLimit[...] of the type |type|.
+  // For each item in the array returned here, a case will be generated which tests a pipeline
+  // layout with one extra bind group layout with one extra binding. That extra binding will have:
+  //
+  //   - If extraTypeSame, any of the binding types which counts toward the same limit as |type|.
+  //     (i.e. 'storage-buffer' <-> 'readonly-storage-buffer').
+  //   - Otherwise, an arbitrary other type.
+  function pickExtraBindingTypes(type, extraTypeSame) {
+    if (extraTypeSame) {
+      switch (type) {
+        case 'storage-buffer':
+        case 'readonly-storage-buffer':
+          return ['storage-buffer', 'readonly-storage-buffer'];
+
+        default:
+          return [type];
+      }
+    } else {
+      return type === 'sampler' ? ['sampled-texture'] : ['sampler'];
+    }
+  }
+
+  kCasesForMaxResourcesPerStageTests = [];
+
+  for (const maxedType of kBindingTypes) {
+    for (const maxedVisibility of kShaderStages) {
+      // Don't generate a case where maxedType isn't valid in maxedVisibility.
+      if (!(kBindingTypeInfo[maxedType].validStages & maxedVisibility)) continue;
+
+      for (const extraTypeSame of [true, false]) {
+        for (const extraType of pickExtraBindingTypes(maxedType, extraTypeSame)) {
+          for (const extraVisibility of kShaderStages) {
+            // Don't generate a case where extraType isn't valid in extraVisibility.
+            if (!(kBindingTypeInfo[extraType].validStages & extraVisibility)) continue;
+            kCasesForMaxResourcesPerStageTests.push({
+              maxedType,
+              maxedVisibility,
+              extraType,
+              extraVisibility
+            });
+          }
+        }
+      }
+    }
+  }
+} // Should never fail unless kMaxBindingsPerBindGroup is exceeded, because the validation for
+// resources-of-type-per-stage is in pipeline layout creation.
+
+g.test('max resources per stage/in bind group layout', async t => {
+  const maxedType = t.params.maxedType;
+  const extraType = t.params.extraType;
+  const {
+    maxedVisibility,
+    extraVisibility
+  } = t.params;
+  const maxedCount = kPerStageBindingLimits[kBindingTypeInfo[maxedType].perStageLimitType];
+  const maxResourceBindings = [];
+
+  for (let i = 0; i < maxedCount; i++) {
+    maxResourceBindings.push({
+      binding: i,
+      visibility: maxedVisibility,
+      type: maxedType
+    });
+  }
+
+  const goodDescriptor = {
+    bindings: maxResourceBindings
+  }; // Control
+
+  t.device.createBindGroupLayout(goodDescriptor);
+  const newDescriptor = clone(goodDescriptor);
+  newDescriptor.bindings.push({
+    binding: maxedCount,
+    visibility: extraVisibility,
+    type: extraType
+  });
+  const shouldError = maxedCount >= kMaxBindingsPerBindGroup;
+  t.expectValidationError(() => {
+    t.device.createBindGroupLayout(newDescriptor);
+  }, shouldError);
+}).params(kCasesForMaxResourcesPerStageTests); // One pipeline layout can have a maximum number of each type of binding *per stage* (which is
+// different for each type). Test that the max works, then add one more binding of same-or-different
+// type and same-or-different visibility.
+
+g.test('max resources per stage/in pipeline layout', async t => {
+  const maxedType = t.params.maxedType;
+  const extraType = t.params.extraType;
+  const {
+    maxedVisibility,
+    extraVisibility
+  } = t.params;
+  const maxedCount = kPerStageBindingLimits[kBindingTypeInfo[maxedType].perStageLimitType];
+  const maxResourceBindings = [];
+
+  for (let i = 0; i < maxedCount; i++) {
+    maxResourceBindings.push({
+      binding: i,
+      visibility: maxedVisibility,
+      type: maxedType
+    });
+  }
+
+  const goodLayout = t.device.createBindGroupLayout({
+    bindings: maxResourceBindings
+  }); // Control
+
+  t.device.createPipelineLayout({
+    bindGroupLayouts: [goodLayout]
+  });
+  const extraLayout = t.device.createBindGroupLayout({
+    bindings: [{
+      binding: 0,
+      visibility: extraVisibility,
+      type: extraType
+    }]
+  }); // Some binding types use the same limit, e.g. 'storage-buffer' and 'readonly-storage-buffer'.
+
+  const newBindingCountsTowardSamePerStageLimit = (maxedVisibility & extraVisibility) !== 0 && kBindingTypeInfo[maxedType].perStageLimitType === kBindingTypeInfo[extraType].perStageLimitType;
+  const layoutExceedsPerStageLimit = newBindingCountsTowardSamePerStageLimit;
+  t.expectValidationError(() => {
+    t.device.createPipelineLayout({
+      bindGroupLayouts: [goodLayout, extraLayout]
+    });
+  }, layoutExceedsPerStageLimit);
+}).params(kCasesForMaxResourcesPerStageTests);
 //# sourceMappingURL=createBindGroupLayout.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createPipelineLayout.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createPipelineLayout.spec.js
index 9d5394f925b..0018c24e540 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createPipelineLayout.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createPipelineLayout.spec.js
@@ -5,8 +5,8 @@
 export const description = `
 createPipelineLayout validation tests.
 `;
-import { TestGroup, pcombine, poptions } from '../../../framework/index.js';
-import { bindingTypeInfo, bindingTypes, shaderStageCombinations } from '../format_info.js';
+import { TestGroup, pbool, pcombine, poptions } from '../../../framework/index.js';
+import { kBindingTypeInfo, kBindingTypes, kShaderStageCombinations } from '../capability_info.js';
 import { ValidationTest } from './validation_test.js';
 
 function clone(descriptor) {
@@ -19,7 +19,7 @@ g.test('number of dynamic buffers exceeds the maximum value', async t => {
     type,
     visibility
   } = t.params;
-  const maxDynamicCount = bindingTypeInfo[type].maxDynamicCount;
+  const maxDynamicCount = kBindingTypeInfo[type].maxDynamicCount;
   const maxDynamicBufferBindings = [];
 
   for (let binding = 0; binding < maxDynamicCount; binding++) {
@@ -58,44 +58,32 @@ g.test('number of dynamic buffers exceeds the maximum value', async t => {
   });
 }).params(pcombine(poptions('visibility', [0, 2, 4, 6]), //
 poptions('type', ['uniform-buffer', 'storage-buffer', 'readonly-storage-buffer'])));
-g.test('dynamic offsets are only allowed on buffers', t => {
-  const {
-    type,
-    visibility
-  } = t.params;
-  const info = bindingTypeInfo[type];
-  const goodDescriptor = {
+g.test('visibility and dynamic offsets', t => {
+  const hasDynamicOffset = t.params.hasDynamicOffset;
+  const type = t.params.type;
+  const visibility = t.params.visibility;
+  const info = kBindingTypeInfo[type];
+  const descriptor = {
     bindings: [{
       binding: 0,
       visibility,
       type,
-      hasDynamicOffset: false
+      hasDynamicOffset
     }]
   };
-  t.device.createPipelineLayout({
-    bindGroupLayouts: [t.device.createBindGroupLayout(goodDescriptor)]
-  });
-  const badDescriptor = clone(goodDescriptor);
-  badDescriptor.bindings[0].hasDynamicOffset = true;
-  const success = info.type === 'buffer';
+  let success = true;
+  if (info.type !== 'buffer' && hasDynamicOffset) success = false;
+  if ((visibility & ~info.validStages) !== 0) success = false;
   t.expectValidationError(() => {
     t.device.createPipelineLayout({
-      bindGroupLayouts: [t.device.createBindGroupLayout(badDescriptor)]
+      bindGroupLayouts: [t.device.createBindGroupLayout(descriptor)]
     });
   }, !success);
-}).params(pcombine(poptions('visibility', shaderStageCombinations), //
-poptions('type', bindingTypes)));
+}).params(pcombine(poptions('type', kBindingTypes), //
+pbool('hasDynamicOffset'), poptions('visibility', kShaderStageCombinations)));
 g.test('number of bind group layouts exceeds the maximum value', async t => {
-  const {
-    visibility,
-    type
-  } = t.params;
   const bindGroupLayoutDescriptor = {
-    bindings: [{
-      binding: 0,
-      visibility,
-      type
-    }]
+    bindings: []
   }; // 4 is the maximum number of bind group layouts.
 
   const maxBindGroupLayouts = [1, 2, 3, 4].map(() => t.device.createBindGroupLayout(bindGroupLayoutDescriptor));
@@ -111,5 +99,5 @@ g.test('number of bind group layouts exceeds the maximum value', async t => {
   t.expectValidationError(() => {
     t.device.createPipelineLayout(badPipelineLayoutDescriptor);
   });
-}).params(pcombine(poptions('visibility', shaderStageCombinations), poptions('type', bindingTypes)));
+});
 //# sourceMappingURL=createPipelineLayout.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createRenderPipeline.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createRenderPipeline.spec.js
index f6a55552655..e4dd32af9e8 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createRenderPipeline.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createRenderPipeline.spec.js
@@ -6,12 +6,13 @@ export const description = `
 createRenderPipeline validation tests.
 `;
 import { TestGroup, poptions } from '../../../framework/index.js';
-import { textureFormatInfo, textureFormats } from '../format_info.js';
+import { kTextureFormatInfo, kTextureFormats } from '../capability_info.js';
 import { ValidationTest } from './validation_test.js';
 
 class F extends ValidationTest {
   async init() {
-    await Promise.all([super.init(), this.initGLSL()]);
+    await super.init();
+    await this.initGLSL();
   }
 
   getDescriptor(options = {}) {
@@ -49,7 +50,7 @@ class F extends ValidationTest {
          *           `
          *         )
          */
-        new Uint32Array([119734787, 66304, 524296, 21, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 393231, 0, 4, 1852399981, 0, 13, 196611, 2, 450, 262149, 4, 1852399981, 0, 393221, 11, 1348430951, 1700164197, 2019914866, 0, 393222, 11, 0, 1348430951, 1953067887, 7237481, 458758, 11, 1, 1348430951, 1953393007, 1702521171, 0, 458758, 11, 2, 1130327143, 1148217708, 1635021673, 6644590, 458758, 11, 3, 1130327143, 1147956341, 1635021673, 6644590, 196613, 13, 0, 327752, 11, 0, 11, 0, 327752, 11, 1, 11, 1, 327752, 11, 2, 11, 3, 327752, 11, 3, 11, 4, 196679, 11, 2, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262165, 8, 32, 0, 262187, 8, 9, 1, 262172, 10, 6, 9, 393246, 11, 7, 6, 10, 10, 262176, 12, 3, 11, 262203, 12, 13, 3, 262165, 14, 32, 1, 262187, 14, 15, 0, 262187, 6, 16, 0, 262187, 6, 17, 1065353216, 458796, 7, 18, 16, 16, 16, 17, 262176, 19, 3, 7, 327734, 2, 4, 0, 3, 131320, 5, 327745, 19, 20, 13, 15, 196670, 20, 18, 65789, 65592])
+        new Uint32Array([119734787, 65536, 524296, 21, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 393231, 0, 4, 1852399981, 0, 13, 196611, 2, 450, 262149, 4, 1852399981, 0, 393221, 11, 1348430951, 1700164197, 2019914866, 0, 393222, 11, 0, 1348430951, 1953067887, 7237481, 458758, 11, 1, 1348430951, 1953393007, 1702521171, 0, 458758, 11, 2, 1130327143, 1148217708, 1635021673, 6644590, 458758, 11, 3, 1130327143, 1147956341, 1635021673, 6644590, 196613, 13, 0, 327752, 11, 0, 11, 0, 327752, 11, 1, 11, 1, 327752, 11, 2, 11, 3, 327752, 11, 3, 11, 4, 196679, 11, 2, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262165, 8, 32, 0, 262187, 8, 9, 1, 262172, 10, 6, 9, 393246, 11, 7, 6, 10, 10, 262176, 12, 3, 11, 262203, 12, 13, 3, 262165, 14, 32, 1, 262187, 14, 15, 0, 262187, 6, 16, 0, 262187, 6, 17, 1065353216, 458796, 7, 18, 16, 16, 16, 17, 262176, 19, 3, 7, 327734, 2, 4, 0, 3, 131320, 5, 327745, 19, 20, 13, 15, 196670, 20, 18, 65789, 65592])
       }),
       entryPoint: 'main'
     };
@@ -127,7 +128,7 @@ g.test('at least one color state is required', async t => {
 });
 g.test('color formats must be renderable', async t => {
   const format = t.params.format;
-  const info = textureFormatInfo[format];
+  const info = kTextureFormatInfo[format];
   const descriptor = t.getDescriptor({
     colorStates: [{
       format
@@ -143,7 +144,7 @@ g.test('color formats must be renderable', async t => {
       t.device.createRenderPipeline(descriptor);
     });
   }
-}).params(poptions('format', textureFormats));
+}).params(poptions('format', kTextureFormats));
 g.test('sample count must be valid', async t => {
   const {
     sampleCount,
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createTexture.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createTexture.spec.js
index 08c6d1b50b5..a7317a88f5b 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createTexture.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createTexture.spec.js
@@ -6,7 +6,7 @@ export const description = `
 createTexture validation tests.
 `;
 import { TestGroup, poptions } from '../../../framework/index.js';
-import { textureFormatInfo, textureFormats } from '../format_info.js';
+import { kTextureFormatInfo, kTextureFormats } from '../capability_info.js';
 import { ValidationTest } from './validation_test.js';
 
 class F extends ValidationTest {
@@ -223,7 +223,7 @@ g.test('it is invalid to submit a destroyed texture before and after encode', as
 }]);
 g.test('it is invalid to have an output attachment texture with non renderable format', async t => {
   const format = t.params.format;
-  const info = textureFormatInfo[format];
+  const info = kTextureFormatInfo[format];
   const descriptor = t.getDescriptor({
     width: 1,
     height: 1,
@@ -232,5 +232,5 @@ g.test('it is invalid to have an output attachment texture with non renderable f
   t.expectValidationError(() => {
     t.device.createTexture(descriptor);
   }, !info.renderable);
-}).params(poptions('format', textureFormats)); // TODO: Add tests for compressed texture formats
+}).params(poptions('format', kTextureFormats)); // TODO: Add tests for compressed texture formats
 //# sourceMappingURL=createTexture.spec.js.map
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createView.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createView.spec.js
index 855d32a3f43..a4fe7ac2a93 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createView.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/createView.spec.js
@@ -396,7 +396,6 @@ g.test('it is invalid to use a texture view created from a destroyed texture', a
   const texture = t.createTexture({
     arrayLayerCount: 1
   });
-  texture.destroy();
   const commandEncoder = t.device.createCommandEncoder();
   const renderPass = commandEncoder.beginRenderPass({
     colorAttachments: [{
@@ -410,6 +409,7 @@ g.test('it is invalid to use a texture view created from a destroyed texture', a
     }]
   });
   renderPass.endPass();
+  texture.destroy();
   t.expectValidationError(() => {
     commandEncoder.finish();
   });
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/render_pass.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/render_pass.spec.js
index f788fb63d8d..67f7bec6d66 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/render_pass.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/render_pass.spec.js
@@ -32,7 +32,7 @@ class F extends ValidationTest {
        *         `
        *       )
        */
-      new Uint32Array([119734787, 66304, 524296, 47, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 458767, 0, 4, 1852399981, 0, 13, 33, 196611, 2, 450, 262149, 4, 1852399981, 0, 393221, 11, 1348430951, 1700164197, 2019914866, 0, 393222, 11, 0, 1348430951, 1953067887, 7237481, 458758, 11, 1, 1348430951, 1953393007, 1702521171, 0, 458758, 11, 2, 1130327143, 1148217708, 1635021673, 6644590, 458758, 11, 3, 1130327143, 1147956341, 1635021673, 6644590, 196613, 13, 0, 458757, 18, 1953654134, 1851095141, 1919903337, 1718960749, 7497062, 393222, 18, 0, 1851880052, 1919903347, 109, 196613, 20, 0, 393221, 33, 1449094247, 1702130277, 1684949368, 30821, 327685, 36, 1701080681, 1818386808, 101, 327752, 11, 0, 11, 0, 327752, 11, 1, 11, 1, 327752, 11, 2, 11, 3, 327752, 11, 3, 11, 4, 196679, 11, 2, 262216, 18, 0, 5, 327752, 18, 0, 35, 0, 327752, 18, 0, 7, 16, 196679, 18, 2, 262215, 20, 34, 0, 262215, 20, 33, 0, 262215, 33, 11, 42, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262165, 8, 32, 0, 262187, 8, 9, 1, 262172, 10, 6, 9, 393246, 11, 7, 6, 10, 10, 262176, 12, 3, 11, 262203, 12, 13, 3, 262165, 14, 32, 1, 262187, 14, 15, 0, 262167, 16, 6, 2, 262168, 17, 16, 2, 196638, 18, 17, 262176, 19, 2, 18, 262203, 19, 20, 2, 262176, 21, 2, 17, 262187, 8, 24, 3, 262172, 25, 16, 24, 262187, 6, 26, 3212836864, 327724, 16, 27, 26, 26, 262187, 6, 28, 1065353216, 327724, 16, 29, 28, 26, 327724, 16, 30, 26, 28, 393260, 25, 31, 27, 29, 30, 262176, 32, 1, 14, 262203, 32, 33, 1, 262176, 35, 7, 25, 262176, 37, 7, 16, 262187, 6, 41, 0, 262176, 45, 3, 7, 327734, 2, 4, 0, 3, 131320, 5, 262203, 35, 36, 7, 327745, 21, 22, 20, 15, 262205, 17, 23, 22, 262205, 14, 34, 33, 196670, 36, 31, 327745, 37, 38, 36, 34, 262205, 16, 39, 38, 327825, 16, 40, 23, 39, 327761, 6, 42, 40, 0, 327761, 6, 43, 40, 1, 458832, 7, 44, 42, 43, 41, 28, 327745, 45, 46, 13, 15, 196670, 46, 44, 65789, 65592])
+      new Uint32Array([119734787, 65536, 524296, 47, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 458767, 0, 4, 1852399981, 0, 13, 33, 196611, 2, 450, 262149, 4, 1852399981, 0, 393221, 11, 1348430951, 1700164197, 2019914866, 0, 393222, 11, 0, 1348430951, 1953067887, 7237481, 458758, 11, 1, 1348430951, 1953393007, 1702521171, 0, 458758, 11, 2, 1130327143, 1148217708, 1635021673, 6644590, 458758, 11, 3, 1130327143, 1147956341, 1635021673, 6644590, 196613, 13, 0, 458757, 18, 1953654134, 1851095141, 1919903337, 1718960749, 7497062, 393222, 18, 0, 1851880052, 1919903347, 109, 196613, 20, 0, 393221, 33, 1449094247, 1702130277, 1684949368, 30821, 327685, 36, 1701080681, 1818386808, 101, 327752, 11, 0, 11, 0, 327752, 11, 1, 11, 1, 327752, 11, 2, 11, 3, 327752, 11, 3, 11, 4, 196679, 11, 2, 262216, 18, 0, 5, 327752, 18, 0, 35, 0, 327752, 18, 0, 7, 16, 196679, 18, 2, 262215, 20, 34, 0, 262215, 20, 33, 0, 262215, 33, 11, 42, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 262165, 8, 32, 0, 262187, 8, 9, 1, 262172, 10, 6, 9, 393246, 11, 7, 6, 10, 10, 262176, 12, 3, 11, 262203, 12, 13, 3, 262165, 14, 32, 1, 262187, 14, 15, 0, 262167, 16, 6, 2, 262168, 17, 16, 2, 196638, 18, 17, 262176, 19, 2, 18, 262203, 19, 20, 2, 262176, 21, 2, 17, 262187, 8, 24, 3, 262172, 25, 16, 24, 262187, 6, 26, 3212836864, 327724, 16, 27, 26, 26, 262187, 6, 28, 1065353216, 327724, 16, 29, 28, 26, 327724, 16, 30, 26, 28, 393260, 25, 31, 27, 29, 30, 262176, 32, 1, 14, 262203, 32, 33, 1, 262176, 35, 7, 25, 262176, 37, 7, 16, 262187, 6, 41, 0, 262176, 45, 3, 7, 327734, 2, 4, 0, 3, 131320, 5, 262203, 35, 36, 7, 327745, 21, 22, 20, 15, 262205, 17, 23, 22, 262205, 14, 34, 33, 196670, 36, 31, 327745, 37, 38, 36, 34, 262205, 16, 39, 38, 327825, 16, 40, 23, 39, 327761, 6, 42, 40, 0, 327761, 6, 43, 40, 1, 458832, 7, 44, 42, 43, 41, 28, 327745, 45, 46, 13, 15, 196670, 46, 44, 65789, 65592])
     });
     const fragmentModule = this.createShaderModule({
       code:
@@ -48,7 +48,7 @@ class F extends ValidationTest {
        *         `
        *       )
        */
-      new Uint32Array([119734787, 66304, 524296, 13, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 393231, 4, 4, 1852399981, 0, 12, 196624, 4, 7, 196611, 2, 450, 262149, 4, 1852399981, 0, 524293, 8, 1734439526, 1953391981, 1718185557, 1114468975, 1701209717, 114, 327686, 8, 0, 1869377379, 114, 196613, 10, 0, 327685, 12, 1734439526, 1869377347, 114, 327752, 8, 0, 35, 0, 196679, 8, 2, 262215, 10, 34, 1, 262215, 10, 33, 0, 262215, 12, 30, 0, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 196638, 8, 7, 262176, 9, 2, 8, 262203, 9, 10, 2, 262176, 11, 3, 7, 262203, 11, 12, 3, 327734, 2, 4, 0, 3, 131320, 5, 65789, 65592])
+      new Uint32Array([119734787, 65536, 524296, 13, 0, 131089, 1, 393227, 1, 1280527431, 1685353262, 808793134, 0, 196622, 0, 1, 393231, 4, 4, 1852399981, 0, 12, 196624, 4, 7, 196611, 2, 450, 262149, 4, 1852399981, 0, 524293, 8, 1734439526, 1953391981, 1718185557, 1114468975, 1701209717, 114, 327686, 8, 0, 1869377379, 114, 196613, 10, 0, 327685, 12, 1734439526, 1869377347, 114, 327752, 8, 0, 35, 0, 196679, 8, 2, 262215, 10, 34, 1, 262215, 10, 33, 0, 262215, 12, 30, 0, 131091, 2, 196641, 3, 2, 196630, 6, 32, 262167, 7, 6, 4, 196638, 8, 7, 262176, 9, 2, 8, 262203, 9, 10, 2, 262176, 11, 3, 7, 262203, 11, 12, 3, 327734, 2, 4, 0, 3, 131320, 5, 65789, 65592])
     });
     const pipeline = this.device.createRenderPipeline({
       vertexStage: {
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setVertexBuffer.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setVertexBuffer.spec.js
index ba22ee2d2a4..47b86150129 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setVertexBuffer.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/setVertexBuffer.spec.js
@@ -10,7 +10,8 @@ import { ValidationTest } from './validation_test.js';
 
 class F extends ValidationTest {
   async init() {
-    await Promise.all([super.init(), this.initGLSL()]);
+    await super.init();
+    await this.initGLSL();
   }
 
   getVertexBuffer() {
diff --git a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/vertex_state.spec.js b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/vertex_state.spec.js
index cc33cde1dec..103a11265c5 100644
--- a/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/vertex_state.spec.js
+++ b/tests/wpt/web-platform-tests/webgpu/suites/cts/validation/vertex_state.spec.js
@@ -25,7 +25,8 @@ function clone(descriptor) {
 
 class F extends ValidationTest {
   async init() {
-    await Promise.all([super.init(), this.initGLSL()]);
+    await super.init();
+    await this.initGLSL();
   }
 
   getDescriptor(vertexState, vertexShaderCode) {
diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/bundle.https.html b/tests/wpt/web-platform-tests/webrtc/protocol/bundle.https.html
index fcc9d470b9f..61d1ff8ac10 100644
--- a/tests/wpt/web-platform-tests/webrtc/protocol/bundle.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/protocol/bundle.https.html
@@ -6,6 +6,7 @@
 <script src="../RTCPeerConnection-helper.js"></script>
 <script>
 'use strict';
+
 promise_test(async t => {
   const caller = new RTCPeerConnection();
   t.add_cleanup(() => caller.close());
@@ -49,4 +50,45 @@ promise_test(async t => {
   assert_equals(iceTransports.length, 2);
   assert_not_equals(iceTransports[0], iceTransports[1]);
 }, 'not negotiating BUNDLE creates two separate ice and dtls transports');
+
+promise_test(async t => {
+  const caller = new RTCPeerConnection();
+  t.add_cleanup(() => caller.close());
+  const callee = new RTCPeerConnection();
+  t.add_cleanup(() => callee.close());
+  const stream = await getNoiseStream({audio: true, video: true});
+  t.add_cleanup(() => stream.getTracks().forEach(track => track.stop()));
+  stream.getTracks().forEach(track => caller.addTrack(track, stream));
+
+  let metadataToBeLoaded;
+  callee.ontrack = (e) => {
+    const stream = e.streams[0];
+    const v = document.createElement('video');
+    v.autoplay = true;
+    v.srcObject = stream;
+    v.id = stream.id
+    metadataToBeLoaded = new Promise((resolve) => {
+      v.addEventListener('loadedmetadata', () => {
+        resolve();
+      });
+    });
+  };
+  exchangeIceCandidates(caller, callee);
+  const offer = await caller.createOffer();
+  await callee.setRemoteDescription(offer);
+  await caller.setLocalDescription(offer);
+  const secondTransport = caller.getSenders()[1].transport; // Save a reference to this transport.
+
+  const answer = await callee.createAnswer();
+  await caller.setRemoteDescription(answer);
+  await callee.setLocalDescription(answer);
+
+  await metadataToBeLoaded;
+  const senders = caller.getSenders();
+  const dtlsTransports = senders.map(s => s.transport);
+  assert_equals(dtlsTransports.length, 2);
+  assert_equals(dtlsTransports[0], dtlsTransports[1]);
+  assert_not_equals(dtlsTransports[1], secondTransport);
+  assert_equals(secondTransport.state, 'closed');
+}, 'bundles on the first transport and closes the second');
 </script>