From 48c420fdb522a61d749e8ee2208322d5ca02a9d6 Mon Sep 17 00:00:00 2001
From: WPT Sync Bot <josh+wptsync@joshmatthews.net>
Date: Fri, 13 Nov 2020 08:20:12 +0000
Subject: [PATCH] Update web-platform-tests to revision
 8d1253647cfe3809ddf58a4ad7c9da5f26985d7e

---
 .../url/url-in-tags-revoke.window.js.ini      |    2 +-
 .../CSS2/floats/hit-test-floats-003.html.ini  |    4 -
 .../inline-negative-margin-001.html.ini       |    5 +-
 ...ckground-properties-border-radius.html.ini |    2 +
 .../change-scale-wide-range.html.ini          |    2 +
 .../cssom-view/elementFromPoint-001.html.ini  |    4 -
 ...lementFromPoint-float-in-relative.html.ini |    4 +
 .../cssom-view/elementFromPosition.html.ini   |    3 +
 .../elementsFromPoint-invalid-cases.html.ini  |    4 +
 ...ListenerAbortController.tentative.html.ini |    4 +
 .../fetch/content-type/response.window.js.ini |   12 +-
 .../fetch/content-type/script.window.js.ini   |    6 -
 .../nosniff/parsing-nosniff.window.js.ini     |    6 -
 .../gamepad/gamepad-secure-context.html.ini   |    3 +
 .../traverse_the_history_1.html.ini           |    4 -
 .../traverse_the_history_3.html.ini}          |    2 +-
 ...ml.ini => traverse_the_history_4.html.ini} |    2 +-
 ...ross-origin-objects-on-new-window.html.ini |    2 -
 .../embedded-opener-remove-frame.html.ini     |    1 +
 .../supported-elements.html.ini               |   13 +-
 .../large-cols-abssize.html.ini               |    2 +
 .../large-cols-percentage.html.ini            |    2 +
 .../large-cols-relsize.html.ini               |    2 +
 .../large-rows-abssize.html.ini               |    2 +
 .../large-rows-percentage.html.ini            |    2 +
 .../large-rows-relsize.html.ini               |    2 +
 .../hash-name-reference.html.ini              |    3 -
 .../iframe_sandbox_popups_escaping-1.html.ini |    4 +-
 .../iframe_sandbox_popups_escaping-2.html.ini |    2 +-
 ...rame_sandbox_popups_nonescaping-1.html.ini |    3 +-
 .../abspos-dialog-layout.html.ini             |   31 +
 .../the-dialog-element/centering.html.ini     |    3 -
 .../document-write/module-delayed.html.ini    |    4 +
 ...le-event-handler-settings-objects.html.ini |    3 -
 .../realtimeanalyser-fft-scaling.html.ini     |    1 +
 .../sub-sample-buffer-stitching.html.ini      |    6 +
 .../webmessaging/without-ports/018.html.ini   |    5 -
 .../url/url-in-tags-revoke.window.js.ini      |    2 +-
 tests/wpt/metadata/MANIFEST.json              | 2494 +++++++++--------
 .../CSS2/floats/hit-test-floats-003.html.ini  |    4 -
 .../inline-negative-margin-001.html.ini       |    5 +-
 ...ckground-properties-border-radius.html.ini |    2 +
 .../change-scale-wide-range.html.ini          |    2 +
 .../cssom-view/elementFromPoint-001.html.ini  |    4 -
 ...lementFromPoint-float-in-relative.html.ini |    4 +
 .../cssom-view/elementFromPosition.html.ini   |    3 +
 .../elementsFromPoint-invalid-cases.html.ini  |    4 +
 ...ListenerAbortController.tentative.html.ini |    4 +
 .../fetch/content-type/response.window.js.ini |   12 +-
 .../fetch/content-type/script.window.js.ini   |    6 -
 .../nosniff/parsing-nosniff.window.js.ini     |    6 -
 .../gamepad/gamepad-secure-context.html.ini   |    3 +
 .../traverse_the_history_1.html.ini           |    4 -
 .../traverse_the_history_3.html.ini           |    4 +
 .../traverse_the_history_4.html.ini           |    4 +
 ...ross-origin-objects-on-new-window.html.ini |    2 -
 .../embedded-opener-remove-frame.html.ini     |    1 +
 .../supported-elements.html.ini               |   13 +-
 .../large-cols-abssize.html.ini               |    2 +
 .../large-cols-percentage.html.ini            |    2 +
 .../large-cols-relsize.html.ini               |    2 +
 .../large-rows-abssize.html.ini               |    2 +
 .../large-rows-percentage.html.ini            |    2 +
 .../large-rows-relsize.html.ini               |    2 +
 .../hash-name-reference.html.ini              |    3 -
 .../iframe_sandbox_popups_escaping-1.html.ini |    4 +-
 .../iframe_sandbox_popups_escaping-2.html.ini |    2 +-
 ...rame_sandbox_popups_nonescaping-1.html.ini |    3 +-
 .../abspos-dialog-layout.html.ini             |    3 +
 .../the-dialog-element/centering.html.ini     |    3 -
 .../dialog-scrolled-viewport.html.ini         |    4 -
 .../document-write/module-delayed.html.ini    |    4 +
 ...le-event-handler-settings-objects.html.ini |    3 -
 .../realtimeanalyser-fft-scaling.html.ini     |    1 +
 .../sub-sample-buffer-stitching.html.ini      |    6 +
 .../webmessaging/without-ports/018.html.ini   |    5 -
 .../web-platform-tests/.azure-pipelines.yml   |    2 +
 .../inline-block-baseline-crash.html          |   12 +
 .../bg-color-with-gradient-ref.html           |    0
 .../bg-color-with-gradient.html               |    0
 .../simple-bg-color-ref.html                  |    0
 .../simple-bg-color.html                      |    0
 ...> out-of-flow-in-multicolumn-001-ref.html} |    0
 .../out-of-flow-in-multicolumn-001.html       |    4 +-
 .../out-of-flow-in-multicolumn-003.html       |   35 +
 .../out-of-flow-in-multicolumn-004-ref.html   |   29 +
 .../out-of-flow-in-multicolumn-004.html       |   45 +
 .../out-of-flow-in-multicolumn-005.html       |   38 +
 .../out-of-flow-in-multicolumn-006.html       |   36 +
 .../out-of-flow-in-multicolumn-007.html       |   33 +
 .../out-of-flow-in-multicolumn-008.html       |   34 +
 .../out-of-flow-in-multicolumn-009.html       |   33 +
 .../out-of-flow-in-multicolumn-010.html       |   39 +
 .../out-of-flow-in-multicolumn-011.html       |   37 +
 .../js/CSS-supports-CSSStyleDeclaration.html  |    1 -
 .../content-visibility-077.tentative.html     |   27 +
 ...n-background-properties-border-radius.html |   55 +
 ...age-orientation-background-properties.html |    1 -
 ...ckground-properties-border-radius-ref.html |   53 +
 ...orientation-background-properties-ref.html |    1 -
 .../hit-test-transformed-child.html           |   30 +
 .../multicol-span-all-margin-003.html         |   12 +
 .../{ => sticky}/position-sticky-bottom.html  |    2 +-
 .../position-sticky-change-top-ref.html       |    0
 .../position-sticky-change-top.html           |    2 +-
 ...position-sticky-child-multicolumn-ref.html |    0
 .../position-sticky-child-multicolumn.html    |    2 +-
 ...tion-sticky-fixed-ancestor-iframe-ref.html |    0
 ...position-sticky-fixed-ancestor-iframe.html |    2 +-
 .../position-sticky-fixed-ancestor-ref.html   |    0
 .../position-sticky-fixed-ancestor.html       |    2 +-
 .../position-sticky-flexbox-ref.html          |    0
 .../{ => sticky}/position-sticky-flexbox.html |    2 +-
 ...ition-sticky-get-bounding-client-rect.html |    0
 .../position-sticky-grid-ref.html             |    0
 .../{ => sticky}/position-sticky-grid.html    |    3 +-
 .../position-sticky-hyperlink-ref.html        |    0
 .../position-sticky-hyperlink.html            |    0
 .../position-sticky-inflow-position.html      |    0
 .../position-sticky-inline-ref.html           |    0
 .../{ => sticky}/position-sticky-inline.html  |    2 +-
 ...y-input-box-gets-focused-after-scroll.html |    0
 .../position-sticky-large-top-2-ref.html      |    0
 ...position-sticky-large-top-2.tentative.html |    0
 .../position-sticky-large-top-ref.html        |    0
 .../position-sticky-large-top.tentative.html  |    0
 .../{ => sticky}/position-sticky-left.html    |    3 +-
 .../{ => sticky}/position-sticky-margins.html |    2 +-
 .../position-sticky-nested-bottom.html        |    2 +-
 .../position-sticky-nested-inline-ref.html    |    0
 .../position-sticky-nested-inline.html        |    2 +-
 .../position-sticky-nested-left.html          |    2 +-
 .../position-sticky-nested-right.html         |    2 +-
 .../position-sticky-nested-table-ref.html     |    0
 .../position-sticky-nested-table.html         |    2 +-
 .../position-sticky-nested-top.html           |    2 +-
 .../position-sticky-offset-overflow.html      |    0
 .../position-sticky-offset-top-left.html      |    0
 .../position-sticky-overflow-hidden.html      |    2 +-
 .../position-sticky-overflow-padding.html     |    2 +-
 .../{ => sticky}/position-sticky-parsing.html |    0
 .../position-sticky-rendering-ref.html        |    0
 .../position-sticky-rendering.html            |    2 +-
 .../{ => sticky}/position-sticky-right.html   |    2 +-
 .../position-sticky-root-scroller.html        |    0
 ...position-sticky-scroll-reposition-ref.html |    0
 .../position-sticky-scroll-reposition.html    |    0
 ...ticky-scroll-with-clip-and-abspos-ref.html |    0
 ...on-sticky-scroll-with-clip-and-abspos.html |    0
 ...sition-sticky-scrolled-remove-sibling.html |    0
 .../position-sticky-stacking-context-ref.html |    0
 .../position-sticky-stacking-context.html     |    2 +-
 .../position-sticky-table-parts-ref.html      |    0
 .../position-sticky-table-parts.html          |    2 +-
 ...osition-sticky-table-tfoot-bottom-ref.html |    0
 .../position-sticky-table-tfoot-bottom.html   |    2 +-
 .../position-sticky-table-th-bottom-ref.html  |    0
 .../position-sticky-table-th-bottom.html      |    0
 .../position-sticky-table-th-left-ref.html    |    0
 .../position-sticky-table-th-left.html        |    2 +-
 .../position-sticky-table-th-right-ref.html   |    0
 .../position-sticky-table-th-right.html       |    2 +-
 .../position-sticky-table-th-top-ref.html     |    0
 .../position-sticky-table-th-top.html         |    0
 .../position-sticky-table-thead-top-ref.html  |    0
 .../position-sticky-table-thead-top.html      |    2 +-
 .../position-sticky-table-tr-bottom-ref.html  |    0
 .../position-sticky-table-tr-bottom.html      |    2 +-
 .../position-sticky-table-tr-top-ref.html     |    0
 .../position-sticky-table-tr-top.html         |    3 +-
 .../{ => sticky}/position-sticky-top.html     |    2 +-
 .../position-sticky-transforms-translate.html |    2 +-
 .../position-sticky-transforms.html           |    2 +-
 .../position-sticky-writing-modes-ref.html    |    0
 .../position-sticky-writing-modes.html        |    2 +-
 .../selection-paint-image-notref.html         |    4 +
 .../css/css-pseudo/selection-paint-image.html |   17 +
 .../aspect-ratio/zero-or-infinity-001.html    |    2 +-
 .../aspect-ratio/zero-or-infinity-002.html    |    2 +-
 .../aspect-ratio/zero-or-infinity-003.html    |    2 +-
 .../aspect-ratio/zero-or-infinity-004.html    |    2 +-
 .../aspect-ratio/zero-or-infinity-005.html    |    2 +-
 .../intrinsic-size-fallback-replaced.html     |   45 +
 .../change-scale-wide-range-ref.html          |    3 +
 .../change-scale-wide-range.html              |   29 +
 .../huge-length-tiny-scale-ref.html           |    2 +
 .../huge-length-tiny-scale.html               |   20 +
 ...esize-child-will-change-transform-ref.html |    3 +
 .../resize-child-will-change-transform.html   |    8 +
 .../elementFromPoint-float-in-relative.html   |   23 +
 .../docs/running-tests/from-web.md            |    6 +
 ...ventListenerAbortController.tentative.html |   24 +
 ...n-html-element-having-contenteditable.html |    2 +-
 .../experimental-features/resources/common.js |    2 +-
 ...feature-policy-trust-token-redemption.html |   10 +-
 ...lt-feature-policy.tentative.https.sub.html |    8 +-
 ...rame-policy-allowed-for-all.https.sub.html |   38 +-
 ...ame-policy-allowed-for-self.https.sub.html |   18 +-
 ...y-allowed-for-some-override.https.sub.html |    2 +-
 ...ame-policy-allowed-for-some.https.sub.html |    4 +-
 ...ader-policy-allowed-for-all.https.sub.html |    7 +-
 ...der-policy-allowed-for-some.https.sub.html |    5 +-
 ...licy-header-policy-declined.https.sub.html |    9 +-
 ...ader-policy-allowed-for-all.https.sub.html |    8 +-
 ...der-policy-allowed-for-self.https.sub.html |    2 +-
 ...t-allowed-by-feature-policy.https.sub.html |    9 +-
 .../reporting/camera-report-only.https.html   |   29 -
 .../camera-report-only.https.html.headers     |    1 -
 .../encrypted-media-report-only.https.html    |   30 -
 ...ypted-media-report-only.https.html.headers |    1 -
 .../reporting/fullscreen-report-only.html     |   31 -
 .../fullscreen-report-only.html.headers       |    1 -
 .../generic-sensor-report-only.https.html     |   55 -
 ...eric-sensor-report-only.https.html.headers |    1 -
 .../geolocation-report-only.https.html        |   36 -
 ...geolocation-report-only.https.html.headers |    1 -
 .../microphone-report-only.https.html         |   29 -
 .../microphone-report-only.https.html.headers |    1 -
 .../reporting/midi-report-only.https.html     |   34 -
 .../midi-report-only.https.html.headers       |    1 -
 .../reporting/payment-report-only.https.html  |   37 -
 .../payment-report-only.https.html.headers    |    1 -
 .../picture-in-picture-report-only.html       |   40 -
 ...icture-in-picture-report-only.html.headers |    1 -
 .../screen-wake-lock-report-only.https.html   |   32 -
 ...n-wake-lock-report-only.https.html.headers |    1 -
 .../reporting/serial-report-only.https.html   |   46 -
 .../serial-report-only.https.html.headers     |    1 -
 .../reporting/sync-xhr-report-only.html       |   28 -
 .../sync-xhr-report-only.html.headers         |    1 -
 .../reporting/usb-report-only.https.html      |   30 -
 .../usb-report-only.https.html.headers        |    1 -
 .../reporting/xr-report-only.https.html       |   37 -
 .../xr-report-only.https.html.headers         |    1 -
 .../feature-policy/resources/featurepolicy.js |    2 +-
 ...network-partition-about-blank-checker.html |   35 +
 ...g-same-site-iframe-outer-contenwindow.html |   29 -
 .../gamepad/feature-policy-gamepad.html       |   15 +-
 ...epad-default-feature-policy.https.sub.html |   42 +-
 .../gamepad/gamepad-secure-context.html       |   17 +-
 .../text/2d.text.draw.align.end.ltr.html      |    1 +
 .../text/2d.text.draw.align.end.ltr.worker.js |    1 +
 .../text/2d.text.draw.align.end.rtl.html      |    1 +
 .../text/2d.text.draw.align.end.rtl.worker.js |    1 +
 .../text/2d.text.draw.align.start.ltr.html    |    1 +
 .../2d.text.draw.align.start.ltr.worker.js    |    1 +
 .../text/2d.text.draw.align.start.rtl.html    |    1 +
 .../2d.text.draw.align.start.rtl.worker.js    |    1 +
 .../canvas/tools/yaml/offscreen/text.yaml     |    8 +-
 ...ross-origin-isolated-permission.https.html |    2 +-
 .../flow-content-0/dialog.html                |   25 +-
 .../sticky-content-crash.html                 |   22 +
 .../large-cols-abssize.html                   |    9 +
 .../large-cols-percentage.html                |    9 +
 .../large-cols-relsize.html                   |    9 +
 .../large-rows-abssize.html                   |    9 +
 .../large-rows-percentage.html                |    9 +
 .../large-rows-relsize.html                   |    9 +
 .../reference/green-ref.html                  |    5 +
 .../resources/green.html                      |    5 +
 .../resources/red.html                        |    5 +
 .../abspos-dialog-layout.html                 |   71 +-
 .../centering-iframe.sub.html                 |    3 +-
 .../the-dialog-element/centering.html         |   54 +-
 .../dialog-scrolled-viewport.html             |   45 -
 ...=> activation-thru-contextmenu-event.html} |   20 +-
 .../web-platform-tests/import-maps/META.yml   |    4 +
 .../web-platform-tests/import-maps/README.md  |    9 -
 .../worker-request/success.tentative.html     |   25 -
 .../import-maps/acquiring/README.md           |    1 +
 .../dynamic-import.html}                      |    7 +-
 .../script-tag.html}                          |    7 +-
 .../worker-request.html}                      |   13 +-
 ...entative.html => bare-specifiers.sub.html} |    9 +-
 .../import-maps/bare/README.md                |    1 +
 .../{core => }/bare/__dir__.headers           |    0
 .../import-maps/{core => }/bare/bare          |    0
 .../{core => }/bare/cross-origin-bare         |    0
 .../import-maps/{core => }/bare/to-bare       |    0
 .../import-maps/{core => }/bare/to-data       |    0
 ...tml => applied-to-target-dynamic.sub.html} |    0
 ...tative.html => applied-to-target.sub.html} |    0
 ...ilure.tentative.html => hash-failure.html} |    0
 .../csp/{hash.tentative.html => hash.html}    |    0
 ...lure.tentative.html => nonce-failure.html} |    0
 .../csp/{nonce.tentative.html => nonce.html}  |    0
 ...line.tentative.html => unsafe-inline.html} |    0
 .../{common => data-driven}/README.md         |    2 +-
 .../parsing-internal.https.html}              |    2 +-
 .../resolving-internal.https.html}            |    4 +-
 .../resolving.https.html}                     |    2 +-
 .../resources/data-base-url.json              |    0
 .../resources/empty-import-map-internal.json  |    0
 .../resources/empty-import-map.json           |    0
 .../resources/overlapping-entries.json        |    0
 .../packages-via-trailing-slashes.json        |    0
 .../resources/parsing-addresses-absolute.json |    0
 .../resources/parsing-addresses-invalid.json  |    0
 .../resources/parsing-addresses.json          |    0
 .../resources/parsing-invalid-json.json       |    0
 .../parsing-schema-normalization.json         |    0
 .../resources/parsing-schema-scope.json       |    0
 .../parsing-schema-specifier-map.json         |    0
 .../resources/parsing-schema-toplevel.json    |    0
 .../resources/parsing-scope-keys.json         |    0
 .../resources/parsing-specifier-keys.json     |    0
 .../resources/parsing-trailing-slashes.json   |    0
 .../resources/resolving-null.json             |    0
 .../resources/scopes-exact-vs-prefix.json     |    0
 .../resources/scopes.json                     |    0
 .../resources/test-helper-iframe.js}          |    0
 .../resources/test-helper.js}                 |    4 +-
 .../resources/tricky-specifiers.json          |    0
 .../resources/url-specifiers.json             |    0
 .../service-worker.js}                        |    2 +-
 .../tools/format_json.py                      |    0
 ...tive.html => data-url-specifiers.sub.html} |   11 +-
 ...html => http-url-like-specifiers.sub.html} |   17 +-
 .../import-maps/module-map-key.html           |   21 +
 .../{core => }/not-as-classic-script.html     |    0
 .../import-maps/resources/test-helper.js      |   11 +-
 .../import-maps/{core => }/static-import.py   |    4 +
 .../penPointerEventProperties.html.ini        |    2 +-
 .../actions/penPointerEvents.html.ini         |    6 +
 .../touchPointerEventProperties.html.ini      |    6 +
 .../testharness/lone-surrogates.html.ini      |    7 +
 .../actions/penPointerEventProperties.html    |   68 +-
 .../testdriver/actions/penPointerEvents.html  |   85 +
 ...revent_pointermove_in_pointerlock.html.ini |    3 -
 .../actions/touchPointerEventProperties.html  |   71 +
 .../testharness/lone-surrogates.html          |   10 +
 ...get-target-ranges-backspace.tentative.html |  586 ++--
 ...target-ranges-forwarddelete.tentative.html |  649 +++--
 ...ges-non-collapsed-selection.tentative.html |  261 +-
 .../input-events-get-target-ranges.js         |   24 +
 .../interfaces/WebCryptoAPI.idl               |   41 -
 .../wpt/web-platform-tests/interfaces/dom.idl |   38 +-
 .../interfaces/scroll-animations.idl          |    2 +-
 tests/wpt/web-platform-tests/lint.ignore      |    2 +-
 ...ediaRecorder-destroy-script-execution.html |   10 +-
 .../MediaRecorder-error.html                  |   43 +-
 .../MediaRecorder-events-and-exceptions.html  |   24 +-
 .../MediaRecorder-mimetype.html               |   68 +-
 .../MediaRecorder-pause-resume.html           |   20 +-
 .../MediaRecorder-stop.html                   |   43 +-
 .../support/MediaRecorder-iframe.html         |   22 +-
 .../mediacapture-record/utils/sources.js      |   75 +
 .../experimental-features/resources/common.js |    2 +-
 ...issions-policy-trust-token-redemption.html |   10 +-
 ...ermissions-policy.tentative.https.sub.html |    8 +-
 ...lowed-by-permissions-policy.https.sub.html |   17 +-
 ...ader-policy-allowed-for-all.https.sub.html |    7 +-
 ...der-policy-allowed-for-some.https.sub.html |    5 +-
 ...licy-header-policy-declined.https.sub.html |    9 +-
 ...ader-policy-allowed-for-all.https.sub.html |    8 +-
 ...der-policy-allowed-for-self.https.sub.html |    2 +-
 .../reporting/camera-report-only.https.html   |    4 +-
 .../reporting/camera-reporting.https.html     |    4 +-
 .../encrypted-media-report-only.https.html    |    4 +-
 .../encrypted-media-reporting.https.html      |    4 +-
 .../reporting/fullscreen-report-only.html     |    4 +-
 .../reporting/fullscreen-reporting.html       |    8 +-
 .../generic-sensor-report-only.https.html     |    4 +-
 .../generic-sensor-reporting.https.html       |    4 +-
 .../geolocation-report-only.https.html        |    4 +-
 .../geolocation-reporting.https.html          |    4 +-
 .../microphone-report-only.https.html         |    4 +-
 .../reporting/microphone-reporting.https.html |    4 +-
 .../reporting/midi-report-only.https.html     |    4 +-
 .../reporting/midi-reporting.https.html       |    4 +-
 .../reporting/payment-report-only.https.html  |    4 +-
 .../reporting/payment-reporting.https.html    |    4 +-
 .../picture-in-picture-report-only.html       |    4 +-
 .../picture-in-picture-reporting.html         |    4 +-
 .../reporting/serial-report-only.https.html   |    6 +-
 .../reporting/serial-reporting.https.html     |    6 +-
 .../reporting/sync-xhr-report-only.html       |    4 +-
 .../reporting/sync-xhr-reporting.html         |    4 +-
 .../reporting/usb-report-only.https.html      |    4 +-
 .../reporting/usb-reporting.https.html        |    4 +-
 .../reporting/xr-report-only.https.html       |    4 +-
 .../reporting/xr-reporting.https.html         |    4 +-
 .../resources/permissions-policy.js           |    2 +-
 .../chromium/generic_sensor_mocks.js          |   12 +-
 .../resources/test/tests/unit/helpers.js      |    2 +-
 .../test/tests/unit/unpaired-surrogates.html  |    5 +
 .../resources/testdriver-actions.js           |   66 +-
 .../resources/testharness.js                  |   29 +-
 .../progress-based-current-time.tenative.html |  501 ++++
 .../scroll-animations/testcommon.js           |    8 +
 ...find-range-from-text-directive-target.html |   71 +
 .../find-range-from-text-directive.html       |  287 ++
 ...ative-shadow-dom-attachment.tentative.html |    4 +-
 ...eclarative-shadow-dom-basic.tentative.html |   32 +-
 ...clarative-shadow-dom-opt-in.tentative.html |  147 +-
 .../declarative/getinnerhtml.tentative.html   |    2 +-
 .../declarative/setinnerhtml.tentative.html   |   39 +
 .../readable-byte-streams/general.any.js      |    2 +-
 .../animations/animated-classname-crash.svg   |    7 +
 .../svglength-animation-invalid-value-1.html  |   15 +-
 .../svglength-animation-invalid-value-2.html  |   15 +-
 .../svglength-animation-invalid-value-3.html  |   15 +-
 .../web-platform-tests/tools/certs/cacert.key |   56 +-
 .../web-platform-tests/tools/certs/cacert.pem |   36 +-
 .../tools/certs/web-platform.test.key         |   52 +-
 .../tools/certs/web-platform.test.pem         |  108 +-
 .../tools/gitignore/gitignore.py              |    7 +-
 .../tools/manifest/jsonlib.py                 |  144 +
 .../tools/manifest/manifest.py                |   14 +-
 .../web-platform-tests/tools/manifest/vcs.py  |   40 +-
 tests/wpt/web-platform-tests/tools/mypy.ini   |    3 +
 .../tools/webdriver/webdriver/client.py       |   66 +-
 .../web-platform-tests/tools/wpt/browser.py   |    8 +-
 tests/wpt/web-platform-tests/tools/wpt/wpt.py |    5 +-
 .../tools/wptrunner/requirements.txt          |    2 +-
 .../requirements_android_webview.txt          |    2 +-
 .../tools/wptrunner/requirements_chrome.txt   |    2 +-
 .../wptrunner/requirements_chrome_android.txt |    2 +-
 .../wptrunner/requirements_chrome_ios.txt     |    2 +-
 .../tools/wptrunner/requirements_edge.txt     |    2 +-
 .../wptrunner/requirements_edge_chromium.txt  |    2 +-
 .../tools/wptrunner/requirements_epiphany.txt |    2 +-
 .../tools/wptrunner/requirements_firefox.txt  |    2 +-
 .../tools/wptrunner/requirements_ie.txt       |    2 +-
 .../tools/wptrunner/requirements_opera.txt    |    2 +-
 .../tools/wptrunner/requirements_safari.txt   |    2 +-
 .../tools/wptrunner/requirements_sauce.txt    |    2 +-
 .../tools/wptrunner/requirements_servo.txt    |    2 +-
 .../tools/wptrunner/requirements_webkit.txt   |    2 +-
 .../wptrunner/browsers/chrome_spki_certs.py   |    2 +-
 .../wptrunner/wptrunner/browsers/firefox.py   |    2 +-
 .../tools/wptrunner/wptrunner/update/state.py |    4 +-
 ...ameter-validation-xhr.tentative.https.html |   10 +-
 ...-parameter-validation.tentative.https.html |   10 +-
 .../require-trusted-types-for.tentative.html  |   22 +
 .../webcodecs/video-encoder.html              |  414 +--
 .../tests/perform_actions/conftest.py         |   21 +
 .../tests/perform_actions/pointer.py          |   79 +
 .../support/test_actions_pointer_wdspec.html  |  102 +
 tests/wpt/web-platform-tests/wpt              |   15 +-
 440 files changed, 6186 insertions(+), 3542 deletions(-)
 delete mode 100644 tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/css-transforms/change-scale-wide-range.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-relative.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/dom/abort/addEventListenerAbortController.tentative.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 rename tests/wpt/{metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini => metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini} (71%)
 rename tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/{traverse_the_history_2.html.ini => traverse_the_history_4.html.ini} (71%)
 delete mode 100644 tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-abssize.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-percentage.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-relsize.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-abssize.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-percentage.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-relsize.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html.ini
 create mode 100644 tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
 delete mode 100644 tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
 create mode 100644 tests/wpt/metadata/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html.ini
 create mode 100644 tests/wpt/metadata/css/css-transforms/change-scale-wide-range.html.ini
 delete mode 100644 tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini
 create mode 100644 tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
 create mode 100644 tests/wpt/metadata/dom/abort/addEventListenerAbortController.tentative.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
 create mode 100644 tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
 delete mode 100644 tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
 create mode 100644 tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-abssize.html.ini
 create mode 100644 tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-percentage.html.ini
 create mode 100644 tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-relsize.html.ini
 create mode 100644 tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-abssize.html.ini
 create mode 100644 tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-percentage.html.ini
 create mode 100644 tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-relsize.html.ini
 delete mode 100644 tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/dialog-scrolled-viewport.html.ini
 create mode 100644 tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
 delete mode 100644 tests/wpt/metadata/webmessaging/without-ports/018.html.ini
 create mode 100644 tests/wpt/web-platform-tests/css/CSS2/linebox/crashtests/inline-block-baseline-crash.html
 rename tests/wpt/web-platform-tests/css/{composite-bgcolor-animation => css-backgrounds}/bg-color-with-gradient-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{composite-bgcolor-animation => css-backgrounds}/bg-color-with-gradient.html (100%)
 rename tests/wpt/web-platform-tests/css/{composite-bgcolor-animation => css-backgrounds}/simple-bg-color-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/{composite-bgcolor-animation => css-backgrounds}/simple-bg-color.html (100%)
 rename tests/wpt/web-platform-tests/css/css-break/{out-of-flow-in-multicolum-001-ref.html => out-of-flow-in-multicolumn-001-ref.html} (100%)
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-003.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-004-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-004.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-005.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-006.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-007.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-008.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-009.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-010.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-011.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-077.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-properties-border-radius-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-multicol/hit-test-transformed-child.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-003.html
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-bottom.html (96%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-change-top-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-change-top.html (96%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-child-multicolumn-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-child-multicolumn.html (96%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-fixed-ancestor-iframe-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-fixed-ancestor-iframe.html (94%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-fixed-ancestor-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-fixed-ancestor.html (97%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-flexbox-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-flexbox.html (97%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-get-bounding-client-rect.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-grid-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-grid.html (97%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-hyperlink-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-hyperlink.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-inflow-position.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-inline-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-inline.html (97%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-input-box-gets-focused-after-scroll.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-large-top-2-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-large-top-2.tentative.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-large-top-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-large-top.tentative.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-left.html (97%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-margins.html (97%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-nested-bottom.html (98%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-nested-inline-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-nested-inline.html (98%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-nested-left.html (98%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-nested-right.html (98%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-nested-table-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-nested-table.html (98%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-nested-top.html (98%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-offset-overflow.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-offset-top-left.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-overflow-hidden.html (98%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-overflow-padding.html (97%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-parsing.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-rendering-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-rendering.html (98%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-right.html (96%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-root-scroller.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-scroll-reposition-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-scroll-reposition.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-scroll-with-clip-and-abspos-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-scroll-with-clip-and-abspos.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-scrolled-remove-sibling.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-stacking-context-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-stacking-context.html (95%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-parts-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-parts.html (96%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-tfoot-bottom-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-tfoot-bottom.html (98%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-th-bottom-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-th-bottom.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-th-left-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-th-left.html (97%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-th-right-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-th-right.html (97%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-th-top-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-th-top.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-thead-top-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-thead-top.html (98%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-tr-bottom-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-tr-bottom.html (98%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-tr-top-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-table-tr-top.html (98%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-top.html (97%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-transforms-translate.html (97%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-transforms.html (97%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-writing-modes-ref.html (100%)
 rename tests/wpt/web-platform-tests/css/css-position/{ => sticky}/position-sticky-writing-modes.html (97%)
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/selection-paint-image-notref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-pseudo/selection-paint-image.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-sizing/intrinsic-size-fallback-replaced.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-transforms/change-scale-wide-range-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-transforms/change-scale-wide-range.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-transforms/huge-length-tiny-scale-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-transforms/huge-length-tiny-scale.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-ui/resize-child-will-change-transform-ref.html
 create mode 100644 tests/wpt/web-platform-tests/css/css-ui/resize-child-will-change-transform.html
 create mode 100644 tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-float-in-relative.html
 create mode 100644 tests/wpt/web-platform-tests/dom/abort/addEventListenerAbortController.tentative.html
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/camera-report-only.https.html
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/camera-report-only.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/encrypted-media-report-only.https.html
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/encrypted-media-report-only.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/fullscreen-report-only.html
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/fullscreen-report-only.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/generic-sensor-report-only.https.html
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/generic-sensor-report-only.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/geolocation-report-only.https.html
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/geolocation-report-only.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/microphone-report-only.https.html
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/microphone-report-only.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/midi-report-only.https.html
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/midi-report-only.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/payment-report-only.https.html
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/payment-report-only.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/picture-in-picture-report-only.html
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/picture-in-picture-report-only.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/screen-wake-lock-report-only.https.html
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/screen-wake-lock-report-only.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/serial-report-only.https.html
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/serial-report-only.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/sync-xhr-report-only.html
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/sync-xhr-report-only.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/usb-report-only.https.html
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/usb-report-only.https.html.headers
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/xr-report-only.https.html
 delete mode 100644 tests/wpt/web-platform-tests/feature-policy/reporting/xr-report-only.https.html.headers
 create mode 100644 tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-about-blank-checker.html
 delete mode 100644 tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-outer-contenwindow.html
 create mode 100644 tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content-crash.html
 create mode 100644 tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-abssize.html
 create mode 100644 tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-percentage.html
 create mode 100644 tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-relsize.html
 create mode 100644 tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-abssize.html
 create mode 100644 tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-percentage.html
 create mode 100644 tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-relsize.html
 create mode 100644 tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/green-ref.html
 create mode 100644 tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/resources/green.html
 create mode 100644 tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/resources/red.html
 delete mode 100644 tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-scrolled-viewport.html
 rename tests/wpt/web-platform-tests/html/user-activation/{activation-thru-contextmenu-event-manual.html => activation-thru-contextmenu-event.html} (68%)
 create mode 100644 tests/wpt/web-platform-tests/import-maps/META.yml
 delete mode 100644 tests/wpt/web-platform-tests/import-maps/README.md
 delete mode 100644 tests/wpt/web-platform-tests/import-maps/acquire-import-maps-flag/worker-request/success.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/import-maps/acquiring/README.md
 rename tests/wpt/web-platform-tests/import-maps/{acquire-import-maps-flag/dynamic-import/success.tentative.html => acquiring/dynamic-import.html} (74%)
 rename tests/wpt/web-platform-tests/import-maps/{acquire-import-maps-flag/script-tag/success.tentative.html => acquiring/script-tag.html} (60%)
 rename tests/wpt/web-platform-tests/import-maps/{core/module-map-key.tentative.html => acquiring/worker-request.html} (54%)
 rename tests/wpt/web-platform-tests/import-maps/{core/bare.sub.tentative.html => bare-specifiers.sub.html} (75%)
 create mode 100644 tests/wpt/web-platform-tests/import-maps/bare/README.md
 rename tests/wpt/web-platform-tests/import-maps/{core => }/bare/__dir__.headers (100%)
 rename tests/wpt/web-platform-tests/import-maps/{core => }/bare/bare (100%)
 rename tests/wpt/web-platform-tests/import-maps/{core => }/bare/cross-origin-bare (100%)
 rename tests/wpt/web-platform-tests/import-maps/{core => }/bare/to-bare (100%)
 rename tests/wpt/web-platform-tests/import-maps/{core => }/bare/to-data (100%)
 rename tests/wpt/web-platform-tests/import-maps/csp/{applied-to-target-dynamic.sub.tentative.html => applied-to-target-dynamic.sub.html} (100%)
 rename tests/wpt/web-platform-tests/import-maps/csp/{applied-to-target.sub.tentative.html => applied-to-target.sub.html} (100%)
 rename tests/wpt/web-platform-tests/import-maps/csp/{hash-failure.tentative.html => hash-failure.html} (100%)
 rename tests/wpt/web-platform-tests/import-maps/csp/{hash.tentative.html => hash.html} (100%)
 rename tests/wpt/web-platform-tests/import-maps/csp/{nonce-failure.tentative.html => nonce-failure.html} (100%)
 rename tests/wpt/web-platform-tests/import-maps/csp/{nonce.tentative.html => nonce.html} (100%)
 rename tests/wpt/web-platform-tests/import-maps/csp/{unsafe-inline.tentative.html => unsafe-inline.html} (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/README.md (98%)
 rename tests/wpt/web-platform-tests/import-maps/{common/parsing.tentative.https.html => data-driven/parsing-internal.https.html} (97%)
 rename tests/wpt/web-platform-tests/import-maps/{common/resolving-internal.tentative.https.html => data-driven/resolving-internal.https.html} (93%)
 rename tests/wpt/web-platform-tests/import-maps/{common/resolving.tentative.https.html => data-driven/resolving.https.html} (97%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/data-base-url.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/empty-import-map-internal.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/empty-import-map.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/overlapping-entries.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/packages-via-trailing-slashes.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/parsing-addresses-absolute.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/parsing-addresses-invalid.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/parsing-addresses.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/parsing-invalid-json.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/parsing-schema-normalization.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/parsing-schema-scope.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/parsing-schema-specifier-map.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/parsing-schema-toplevel.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/parsing-scope-keys.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/parsing-specifier-keys.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/parsing-trailing-slashes.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/resolving-null.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/scopes-exact-vs-prefix.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/scopes.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common/resources/common-test-helper-iframe.js => data-driven/resources/test-helper-iframe.js} (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common/resources/common-test-helper.js => data-driven/resources/test-helper.js} (97%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/tricky-specifiers.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/resources/url-specifiers.json (100%)
 rename tests/wpt/web-platform-tests/import-maps/{common/common-test-service-worker.js => data-driven/service-worker.js} (91%)
 rename tests/wpt/web-platform-tests/import-maps/{common => data-driven}/tools/format_json.py (100%)
 rename tests/wpt/web-platform-tests/import-maps/{core/data.sub.tentative.html => data-url-specifiers.sub.html} (75%)
 rename tests/wpt/web-platform-tests/import-maps/{core/http.sub.tentative.html => http-url-like-specifiers.sub.html} (59%)
 create mode 100644 tests/wpt/web-platform-tests/import-maps/module-map-key.html
 rename tests/wpt/web-platform-tests/import-maps/{core => }/not-as-classic-script.html (100%)
 rename tests/wpt/web-platform-tests/import-maps/{core => }/static-import.py (54%)
 create mode 100644 tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/penPointerEvents.html.ini
 create mode 100644 tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/touchPointerEventProperties.html.ini
 create mode 100644 tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testharness/lone-surrogates.html.ini
 create mode 100644 tests/wpt/web-platform-tests/infrastructure/testdriver/actions/penPointerEvents.html
 delete mode 100644 tests/wpt/web-platform-tests/infrastructure/testdriver/actions/pointerevent_pointermove_in_pointerlock.html.ini
 create mode 100644 tests/wpt/web-platform-tests/infrastructure/testdriver/actions/touchPointerEventProperties.html
 create mode 100644 tests/wpt/web-platform-tests/infrastructure/testharness/lone-surrogates.html
 create mode 100644 tests/wpt/web-platform-tests/mediacapture-record/utils/sources.js
 create mode 100644 tests/wpt/web-platform-tests/scroll-animations/progress-based-current-time.tenative.html
 create mode 100644 tests/wpt/web-platform-tests/scroll-to-text-fragment/find-range-from-text-directive-target.html
 create mode 100644 tests/wpt/web-platform-tests/scroll-to-text-fragment/find-range-from-text-directive.html
 create mode 100644 tests/wpt/web-platform-tests/shadow-dom/declarative/setinnerhtml.tentative.html
 create mode 100644 tests/wpt/web-platform-tests/svg/animations/animated-classname-crash.svg
 create mode 100644 tests/wpt/web-platform-tests/tools/manifest/jsonlib.py
 create mode 100644 tests/wpt/web-platform-tests/webdriver/tests/perform_actions/support/test_actions_pointer_wdspec.html

diff --git a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
index 3605e8f3fc9..76b44d9e9cf 100644
--- a/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -4,7 +4,7 @@
     expected: TIMEOUT
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Fetching a blob URL immediately before revoking it works in an iframe.]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
index 6425f4beda1..cb2edcb5dcd 100644
--- a/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -5,9 +5,6 @@
   [[data-expected-height\] 7]
     expected: FAIL
 
-  [[data-expected-height\] 1]
-    expected: FAIL
-
-  [[data-expected-height\] 2]
+  [[data-expected-height\] 4]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html.ini b/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html.ini
new file mode 100644
index 00000000000..d7080b90fcf
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html.ini
@@ -0,0 +1,2 @@
+[image-orientation-background-properties-border-radius.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/change-scale-wide-range.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/change-scale-wide-range.html.ini
new file mode 100644
index 00000000000..48a4ed0c771
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/change-scale-wide-range.html.ini
@@ -0,0 +1,2 @@
+[change-scale-wide-range.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
deleted file mode 100644
index e38782d8c85..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementFromPoint-001.html]
-  [CSSOM View - 5 - extensions to the Document interface]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-relative.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-relative.html.ini
new file mode 100644
index 00000000000..fa416a1a5eb
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-float-in-relative.html.ini
@@ -0,0 +1,4 @@
+[elementFromPoint-float-in-relative.html]
+  [elementFromPoint-float-in-relative]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
index c131078eace..23c61ede1a1 100644
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPosition.html.ini
@@ -17,3 +17,6 @@
   [test the top of layer]
     expected: FAIL
 
+  [test some point of the element: top left corner]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..e181af5397f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,4 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/dom/abort/addEventListenerAbortController.tentative.html.ini b/tests/wpt/metadata-layout-2020/dom/abort/addEventListenerAbortController.tentative.html.ini
new file mode 100644
index 00000000000..60f56e372f7
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/dom/abort/addEventListenerAbortController.tentative.html.ini
@@ -0,0 +1,4 @@
+[addEventListenerAbortController.tentative.html]
+  [Tests support for EventController to cancel event listeners in addEventListener.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index df19a73ebe2..999dcf4246b 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -324,9 +324,15 @@
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index 2003288747e..2d5faa72ac7 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -53,12 +53,6 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript x/x]
-    expected: FAIL
-
   [separate text/javascript;charset=windows-1252 error text/javascript]
     expected: FAIL
 
-  [separate text/javascript ]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
index b290d442952..30e1b851fd4 100644
--- a/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,9 +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%22nosniFF%22]
-    expected: FAIL
-
-  [Content-Type-Options%3A%20nosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/gamepad/gamepad-secure-context.html.ini b/tests/wpt/metadata-layout-2020/gamepad/gamepad-secure-context.html.ini
index 177c9715232..664014e3d71 100644
--- a/tests/wpt/metadata-layout-2020/gamepad/gamepad-secure-context.html.ini
+++ b/tests/wpt/metadata-layout-2020/gamepad/gamepad-secure-context.html.ini
@@ -2,3 +2,6 @@
   [When in a non-secure context, getGamepad() should throw an error.]
     expected: FAIL
 
+  [Gamepad API is not exposed in insecure contexts]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
index 75d75b4cda2..51f8272a6de 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_2.html]
+[traverse_the_history_3.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
similarity index 71%
rename from tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
index 75d75b4cda2..385376c7321 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_2.html]
+[traverse_the_history_4.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 9a85a905394..8e2a63e3b7f 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,4 +1,5 @@
 [embedded-opener-remove-frame.html]
+  expected: CRASH
   [opener of discarded nested browsing context]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index ba183b6db32..3538891dae8 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,20 +1,17 @@
 [supported-elements.html]
   expected: TIMEOUT
   [Contenteditable element should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Element with tabindex should support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [Host element with delegatesFocus should support autofocus]
-    expected: NOTRUN
-
-  [Non-HTMLElement should not support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-abssize.html.ini b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-abssize.html.ini
new file mode 100644
index 00000000000..ea0621c13b8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-abssize.html.ini
@@ -0,0 +1,2 @@
+[large-cols-abssize.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-percentage.html.ini b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-percentage.html.ini
new file mode 100644
index 00000000000..75a2253cc8b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-percentage.html.ini
@@ -0,0 +1,2 @@
+[large-cols-percentage.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-relsize.html.ini b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-relsize.html.ini
new file mode 100644
index 00000000000..493a31521f4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-relsize.html.ini
@@ -0,0 +1,2 @@
+[large-cols-relsize.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-abssize.html.ini b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-abssize.html.ini
new file mode 100644
index 00000000000..af360ef7603
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-abssize.html.ini
@@ -0,0 +1,2 @@
+[large-rows-abssize.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-percentage.html.ini b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-percentage.html.ini
new file mode 100644
index 00000000000..9aaee252bb8
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-percentage.html.ini
@@ -0,0 +1,2 @@
+[large-rows-percentage.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-relsize.html.ini b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-relsize.html.ini
new file mode 100644
index 00000000000..3243f718f4b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-relsize.html.ini
@@ -0,0 +1,2 @@
+[large-rows-relsize.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 09ae27d7480..5c3ac06f42a 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -171,6 +171,3 @@
   [XHTML img usemap="#hash-id"]
     expected: FAIL
 
-  [HTML (standards) IMG usemap="no-hash-name"]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 3d627c10223..42ebcc9d57e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-1.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index c6f45be1eb2..e63fe7c263e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index d913fcbb129..1b74d6e073d 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html.ini
new file mode 100644
index 00000000000..373648ae0b5
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html.ini
@@ -0,0 +1,31 @@
+[abspos-dialog-layout.html]
+  [showModal() should center in the viewport]
+    expected: FAIL
+
+  [The dialog should be centered regardless of the presence of a horizontal scrollbar.]
+    expected: FAIL
+
+  [A tall dialog should be positioned at the top of the viewport.]
+    expected: FAIL
+
+  [Dialog should not recenter on relayout.]
+    expected: FAIL
+
+  [Dialog should be recentered if showModal() is called after removing 'open'.]
+    expected: FAIL
+
+  [Dialog should be recentered if showModal() is called after close()]
+    expected: FAIL
+
+  [A centered dialog's position should survive becoming display:none temporarily.]
+    expected: FAIL
+
+  [Dialog's specified position should survive after close() and showModal().]
+    expected: FAIL
+
+  [Centering should work when dialog is inside positioned containers.]
+    expected: FAIL
+
+  [Dialog should still be centered when removed, and re-added to the document.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-dialog-element/centering.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-dialog-element/centering.html.ini
index 3b9b7cf0834..c9b2a8a1db5 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-dialog-element/centering.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/interactive-elements/the-dialog-element/centering.html.ini
@@ -26,9 +26,6 @@
   [horizontal-tb: wide viewport]
     expected: FAIL
 
-  [horizontal-tb: dialog and viewport match]
-    expected: FAIL
-
   [vertical-lr: dialog bigger than viewport]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 5602ea31dbe..dbec6f2c2ff 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -3,6 +3,3 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
-  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index 66bd350083b..a56bad443a2 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,4 +1,5 @@
 [realtimeanalyser-fft-scaling.html]
+  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 5057ef8c699..8de46c87052 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -263,3 +263,9 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-9.3167430000000000e+6\t9.3139332532882690e-1\t9.3167439313933253e+6\t1.0003017713385550e+7\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3167439313933253e+6 at index of 28696.\n\tMax RelError of 1.0003017713385550e+7 at index of 28696.\n]
     expected: FAIL
 
+  [X SNR (-384.5345319359717 dB) is not greater than or equal to 65.737. Got -384.5345319359717.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-2.5028273606901356e+21\t9.3139332532882690e-1\t2.5028273606901356e+21\t2.6871862752575734e+21\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 2.5028273606901356e+21 at index of 28696.\n\tMax RelError of 2.6871862752575734e+21 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index faa00f45ecf..d4f62ed7113 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 04382bf600b..c5213b348ad 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -29,6 +29,15 @@
       ]
      },
      "linebox": {
+      "crashtests": {
+       "inline-block-baseline-crash.html": [
+        "8c88583c55bb4c07f571355edbff57f024c51c6a",
+        [
+         null,
+         {}
+        ]
+       ]
+      },
       "video-needs-layout-crash.html": [
        "b8c52edf8272abc6f7c30372b1d37e9545d08c74",
        [
@@ -775,6 +784,13 @@
          null,
          {}
         ]
+       ],
+       "sticky-content-crash.html": [
+        "a6e8fa7a8265fe2753ee557f9e1a226edfd8fd5c",
+        [
+         null,
+         {}
+        ]
        ]
       }
      },
@@ -1063,6 +1079,13 @@
    },
    "svg": {
     "animations": {
+     "animated-classname-crash.svg": [
+      "5b28addfdd1baa92fe87a6fa44f8cc89d12e5ed3",
+      [
+       null,
+       {}
+      ]
+     ],
      "end-of-time-crash.html": [
       "bd38d93161414ed9b19750805b313972b40703af",
       [
@@ -17006,13 +17029,6 @@
      }
     },
     "user-activation": {
-     "activation-thru-contextmenu-event-manual.html": [
-      "998bac3694c6f81e099c1c9eab41c704adcf10f9",
-      [
-       null,
-       {}
-      ]
-     ],
      "no-activation-thru-escape-key-manual.html": [
       "4f03195f434742d80574c481092b307d4ad9108f",
       [
@@ -120632,34 +120648,6 @@
       ]
      ]
     },
-    "composite-bgcolor-animation": {
-     "bg-color-with-gradient.html": [
-      "7ef5d611bcf2c131dbeef8e72877328ef1be7710",
-      [
-       null,
-       [
-        [
-         "/css/composite-bgcolor-animation/bg-color-with-gradient-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "simple-bg-color.html": [
-      "07bea44d21964b832cd9e4b4f32098ec41a2c206",
-      [
-       null,
-       [
-        [
-         "/css/composite-bgcolor-animation/simple-bg-color-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ]
-    },
     "compositing": {
      "background-blending": {
       "background-blend-mode-gradient-image.html": [
@@ -125919,6 +125907,19 @@
        {}
       ]
      ],
+     "bg-color-with-gradient.html": [
+      "7ef5d611bcf2c131dbeef8e72877328ef1be7710",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/bg-color-with-gradient-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "border-bottom-left-radius-001.xht": [
       "2f55928dc8f51d5e5596676ff242a9fe2e3aaafb",
       [
@@ -127375,6 +127376,19 @@
        {}
       ]
      ],
+     "simple-bg-color.html": [
+      "07bea44d21964b832cd9e4b4f32098ec41a2c206",
+      [
+       null,
+       [
+        [
+         "/css/css-backgrounds/simple-bg-color-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "subpixel-repeat-no-repeat-mix.html": [
       "1828b974877c2dc780388f044126d0499cc5f9fb",
       [
@@ -128082,12 +128096,12 @@
       ]
      ],
      "out-of-flow-in-multicolumn-001.html": [
-      "148f39467f7b1db682cf16940702948152ff912e",
+      "370561f3362bfec6d2ea9d6a0ba5b71ffbb00e70",
       [
        null,
        [
         [
-         "/css/css-break/out-of-flow-in-multicolum-001-ref.html",
+         "/css/css-break/out-of-flow-in-multicolumn-001-ref.html",
          "=="
         ]
        ],
@@ -128107,6 +128121,123 @@
        {}
       ]
      ],
+     "out-of-flow-in-multicolumn-003.html": [
+      "1eac0b9a67f385cb118f60174678ea0070621eb8",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "out-of-flow-in-multicolumn-004.html": [
+      "86ffa50d269c6c98d3b6b51c8d730ada91a6717f",
+      [
+       null,
+       [
+        [
+         "/css/css-break/out-of-flow-in-multicolumn-004-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "out-of-flow-in-multicolumn-005.html": [
+      "6f9a1641be65619e94cf06e29ca20db22becd592",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "out-of-flow-in-multicolumn-006.html": [
+      "8138b429a40d2dda9ac3a30f0970e5c00be7af58",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "out-of-flow-in-multicolumn-007.html": [
+      "934f12c0cbec3555fdb56d6121c343169af5808a",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "out-of-flow-in-multicolumn-008.html": [
+      "3e665b3564c4edf374d9fd6611fe6cd4f8e77678",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "out-of-flow-in-multicolumn-009.html": [
+      "ac278953b0857934d65b52ff0d2b3d00d7854f3b",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "out-of-flow-in-multicolumn-010.html": [
+      "76f7f2d1e34f55a6c9fae74a4bbe9af7104024e6",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "out-of-flow-in-multicolumn-011.html": [
+      "8432c1afde9164b2b6d277c616e037ca6c0bc402",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "overflowed-block-with-no-room-after-000.html": [
       "084e16fb38de072fb83f92ba01302a2e404cdd97",
       [
@@ -153716,8 +153847,37 @@
         }
        ]
       ],
+      "image-orientation-background-properties-border-radius.html": [
+       "b7c80ff0f678b3d816fb122f085b12be3e81f8f2",
+       [
+        null,
+        [
+         [
+          "/css/css-images/image-orientation/reference/image-orientation-background-properties-border-radius-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             10,
+             10
+            ],
+            [
+             100,
+             100
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
       "image-orientation-background-properties.html": [
-       "45651286b176df4a93e3237425458c07fabfdda9",
+       "732233949e5949a6b03458c7b54edc509ba6f482",
        [
         null,
         [
@@ -162928,6 +163088,19 @@
        {}
       ]
      ],
+     "multicol-span-all-margin-003.html": [
+      "06c1bea3abfed404db4b7b7b6ad83be0f5e3ca24",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "multicol-span-all-margin-bottom-001.xht": [
       "eabb519e6722ad26ee9e43f3d55d129332807e92",
       [
@@ -166981,344 +167154,6 @@
        {}
       ]
      ],
-     "position-sticky-change-top.html": [
-      "b15e7feb8265b90dfa0f693dae140c94d9524d54",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-change-top-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-child-multicolumn.html": [
-      "d12712eadd1cbe179e147a8a99f0ca03e54a68d1",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-child-multicolumn-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-fixed-ancestor-iframe.html": [
-      "d442931663f09a0bedd587e28e253941e2a003ce",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-fixed-ancestor-iframe-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-fixed-ancestor.html": [
-      "54c7ff303feb4a864d6669c6a36087ebd2f19f69",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-fixed-ancestor-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-flexbox.html": [
-      "86b0d19fa9646651321c86ebaa663101577a2b24",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-flexbox-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-grid.html": [
-      "ef4f88a3c1f6528915a0f4af2bdce2632480afbe",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-grid-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-hyperlink.html": [
-      "fc1c2fce0aac333dc43880b2541a0275b16ca4f4",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-hyperlink-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-inline.html": [
-      "3c2becea4e975ce94c556ca4318da9c8196fb1d8",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-inline-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-large-top-2.tentative.html": [
-      "1cf9c0dfb43b6bfd71c1496a5d7b3b9428d0c086",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-large-top-2-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-large-top.tentative.html": [
-      "b00a0d139683717b57633e38bb9ce7f033833b65",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-large-top-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-nested-inline.html": [
-      "07226f8730aceaaae2f501f4d32be6ac9e5a1b1f",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-nested-inline-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-nested-table.html": [
-      "6632a49e11b7693969e2ea9d4c05b988db5900ca",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-nested-table-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-rendering.html": [
-      "d3408eb2468804357d2583e6830eda6efe1e86d9",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-rendering-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-scroll-reposition.html": [
-      "b75275c64fe3b8b1130abade63ea69c575085b80",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-scroll-reposition-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-scroll-with-clip-and-abspos.html": [
-      "46085b49b4c405bdc1d0a05eafda3faca8ecf74a",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-scroll-with-clip-and-abspos-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-stacking-context.html": [
-      "d047ba1152230685acace2c3df29e20c0fad38e2",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-stacking-context-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-table-parts.html": [
-      "52a9be548b19a4cce216995a8c123d9abededdd2",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-table-parts-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-table-tfoot-bottom.html": [
-      "8947bc6ef2b63e60c0476b9558251332b9cd1cde",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-table-tfoot-bottom-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-table-th-bottom.html": [
-      "878732fd5bc7c28f048d8079f9d7a19d0e7c0f22",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-table-th-bottom-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-table-th-left.html": [
-      "aa83484965564407f38663079bc591daf1cf8522",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-table-th-left-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-table-th-right.html": [
-      "8686301d8011c5b7f835567c538c0f71562547f9",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-table-th-right-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-table-th-top.html": [
-      "0bad3469cbb5a5a52a7efcd7da67a681684796df",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-table-th-top-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-table-thead-top.html": [
-      "9c9cf061c997a7ed4a32a8cffe475f296aa6c1ea",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-table-thead-top-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-table-tr-bottom.html": [
-      "dbbaaf090ebea34e8ad6d1b9fdec3137488fc34f",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-table-tr-bottom-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-table-tr-top.html": [
-      "cd7fb8bff90efa630ce5fdea23689633c19b9163",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-table-tr-top-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
-     "position-sticky-writing-modes.html": [
-      "9e0856889d68186273ca3c56ad1b1616793b9b6d",
-      [
-       null,
-       [
-        [
-         "/css/css-position/position-sticky-writing-modes-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "static-position": {
       "htb-ltr-ltr.html": [
        "5a19c0e9ccd5fa67e1df49e85da74a3a09d2fa15",
@@ -167659,6 +167494,346 @@
        ]
       ]
      },
+     "sticky": {
+      "position-sticky-change-top.html": [
+       "6a327ccd567818c2267d808a890796724384726e",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-change-top-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-child-multicolumn.html": [
+       "14bb695f1a427e369bd9a8e9c6f761286ce195fd",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-child-multicolumn-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-fixed-ancestor-iframe.html": [
+       "e50f5c829b6bcee84385083648bca5cc145e1e37",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-fixed-ancestor-iframe-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-fixed-ancestor.html": [
+       "52760992b111fb41d849cad05fb761a328548f6b",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-fixed-ancestor-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-flexbox.html": [
+       "fda06267bc154f267d0b48ee13aa8c1961c0da59",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-flexbox-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-grid.html": [
+       "0a0d39e4bd141cdc305083365ab1bb9bd8dec25a",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-grid-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-hyperlink.html": [
+       "fc1c2fce0aac333dc43880b2541a0275b16ca4f4",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-hyperlink-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-inline.html": [
+       "7bad4b573e7d720445828c0de54cd706d4dd33cd",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-inline-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-large-top-2.tentative.html": [
+       "1cf9c0dfb43b6bfd71c1496a5d7b3b9428d0c086",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-large-top-2-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-large-top.tentative.html": [
+       "b00a0d139683717b57633e38bb9ce7f033833b65",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-large-top-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-nested-inline.html": [
+       "b646453c17a342ae8a168893b007a3a0163c9fd3",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-nested-inline-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-nested-table.html": [
+       "7a5fca415dcefacd590ec147efea99e6f4f134c3",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-nested-table-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-rendering.html": [
+       "506f9f9792862eaf416a70e801fad29273a968f1",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-rendering-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-scroll-reposition.html": [
+       "b75275c64fe3b8b1130abade63ea69c575085b80",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-scroll-reposition-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-scroll-with-clip-and-abspos.html": [
+       "46085b49b4c405bdc1d0a05eafda3faca8ecf74a",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-scroll-with-clip-and-abspos-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-stacking-context.html": [
+       "c02d7ff7bce57d5cd5fee9574bfe7de79e3fecfb",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-stacking-context-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-table-parts.html": [
+       "f034b99e8e5c386d7408a393e649f2f0f740e203",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-table-parts-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-table-tfoot-bottom.html": [
+       "dfb4fd12a03588d9e22017c675bb3696bb1c536f",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-table-tfoot-bottom-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-table-th-bottom.html": [
+       "878732fd5bc7c28f048d8079f9d7a19d0e7c0f22",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-table-th-bottom-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-table-th-left.html": [
+       "c33d13548e37b07fbe9197ac35c17ad4afb0079d",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-table-th-left-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-table-th-right.html": [
+       "e9c88c56b5202e7214b853b0a4a9b4ef0f78fd93",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-table-th-right-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-table-th-top.html": [
+       "0bad3469cbb5a5a52a7efcd7da67a681684796df",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-table-th-top-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-table-thead-top.html": [
+       "e80fc12b63fac4c59dc0776ef489665ba34c5372",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-table-thead-top-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-table-tr-bottom.html": [
+       "253ada5ae8368441e28b2981795730f2e34d59fb",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-table-tr-bottom-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-table-tr-top.html": [
+       "1d18f631c6b02a3daa09971499da110502917cd8",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-table-tr-top-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "position-sticky-writing-modes.html": [
+       "5deac8ca4aa5f0cc396ffcfa479a42c6d7ac0ce0",
+       [
+        null,
+        [
+         [
+          "/css/css-position/sticky/position-sticky-writing-modes-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ]
+     },
      "z-index-blend-will-change-overlapping-layers.html": [
       "7c43c3336872db048664e52943b63f195b761ae2",
       [
@@ -169337,6 +169512,19 @@
        {}
       ]
      ],
+     "selection-paint-image.html": [
+      "f5e2383ca8110d03c96e2e52f1701850c96f9962",
+      [
+       null,
+       [
+        [
+         "/css/css-pseudo/selection-paint-image-notref.html",
+         "!="
+        ]
+       ],
+       {}
+      ]
+     ],
      "selection-text-shadow-016.html": [
       "44403c1b5f5fb2bf7245c73f5eb5c15ffd19a98a",
       [
@@ -175441,7 +175629,7 @@
        ]
       ],
       "zero-or-infinity-001.html": [
-       "d2ed6cfb2345d715645a8514d759052c4c446589",
+       "760635c40e8fde8f3514761c77e83385592861b0",
        [
         null,
         [
@@ -175454,7 +175642,7 @@
        ]
       ],
       "zero-or-infinity-002.html": [
-       "28470dd8756ebb3cb2463ff89e72f61d1f837a99",
+       "300e56d92cdeeeac32105a297f2e6b7bd8ca3172",
        [
         null,
         [
@@ -175467,7 +175655,7 @@
        ]
       ],
       "zero-or-infinity-003.html": [
-       "ad0c3bf176b30981068730ef083d0f2218103544",
+       "5fb83a105cee2937822b20a90ed488027aeab0a9",
        [
         null,
         [
@@ -175480,7 +175668,7 @@
        ]
       ],
       "zero-or-infinity-004.html": [
-       "58db88c3bc1d8aba7b32fa378c1fe3f25c592ed4",
+       "a90837bad7b2afd2c04d6fde8b9a1517295f6945",
        [
         null,
         [
@@ -175493,7 +175681,7 @@
        ]
       ],
       "zero-or-infinity-005.html": [
-       "2892028f94075306176947c2419b8a86f7a113c2",
+       "d018184faaa90b814a09a03e9321e75986a93af5",
        [
         null,
         [
@@ -192554,6 +192742,19 @@
        {}
       ]
      ],
+     "change-scale-wide-range.html": [
+      "ec41946cfdd1ea65352f75a3ae11371070b507fa",
+      [
+       null,
+       [
+        [
+         "/css/css-transforms/change-scale-wide-range-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "composited-under-rotateY-180deg-clip-perspective.html": [
       "71b2fd1cb4facf8f4a1d1f6ba6a684792b7d4ba5",
       [
@@ -193862,6 +194063,19 @@
        ]
       ]
      },
+     "huge-length-tiny-scale.html": [
+      "53f4f7d4478017615d1319fcf10ce45e03497fa9",
+      [
+       null,
+       [
+        [
+         "/css/css-transforms/huge-length-tiny-scale-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "individual-transform": {
       "individual-transform-1.html": [
        "f21954e01dfc0f8f70c9dd43262d40b3374010b5",
@@ -203876,6 +204090,19 @@
        {}
       ]
      ],
+     "resize-child-will-change-transform.html": [
+      "b8adf53b04d9b6d14a7ff92cc0058ae1e39598eb",
+      [
+       null,
+       [
+        [
+         "/css/css-ui/resize-child-will-change-transform-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "text-overflow-001.html": [
       "375c5c1e3cf060be068303b67e5505f7863e0ce9",
       [
@@ -244320,6 +244547,86 @@
         ]
        ]
       },
+      "the-frameset-and-frame-elements": {
+       "large-cols-abssize.html": [
+        "ba55da868651d06bd48e8ab151584316defbaad6",
+        [
+         null,
+         [
+          [
+           "/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/green-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "large-cols-percentage.html": [
+        "ba55da868651d06bd48e8ab151584316defbaad6",
+        [
+         null,
+         [
+          [
+           "/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/green-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "large-cols-relsize.html": [
+        "1bfb2b5404d542f59808826233875977ae9b4f81",
+        [
+         null,
+         [
+          [
+           "/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/green-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "large-rows-abssize.html": [
+        "7cd86b94554b9268f30b220ddf8c45021eabf963",
+        [
+         null,
+         [
+          [
+           "/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/green-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "large-rows-percentage.html": [
+        "7cd86b94554b9268f30b220ddf8c45021eabf963",
+        [
+         null,
+         [
+          [
+           "/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/green-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ],
+       "large-rows-relsize.html": [
+        "7fd29f6a9e7538f5ce37a914827bf1b03e5cd346",
+        [
+         null,
+         [
+          [
+           "/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/green-ref.html",
+           "=="
+          ]
+         ],
+         {}
+        ]
+       ]
+      },
       "the-hr-element-0": {
        "align.html": [
         "1657f2458d0f606fb787b6d809309dd5192b1a2a",
@@ -255843,7 +256150,7 @@
   },
   "support": {
    ".azure-pipelines.yml": [
-    "882b63058dc911885ad5652012313bc5236d2680",
+    "412822c7edb5980cc02968a75802e912702c8707",
     []
    ],
    ".codecov.yml": [
@@ -299129,16 +299436,6 @@
      "5cb26179b8dbe4423885bcc7c8d687bab224df91",
      []
     ],
-    "composite-bgcolor-animation": {
-     "bg-color-with-gradient-ref.html": [
-      "5c76f3408aebe6e2964215af3f98745e833e190e",
-      []
-     ],
-     "simple-bg-color-ref.html": [
-      "d8003b58e3ac1c5e917500a59b60c0d2e56287a3",
-      []
-     ]
-    },
     "compositing": {
      "Blending_in_a_group_with_filter-ref.html": [
       "ad512028adae91920814b79714ea99ec51de4dc2",
@@ -300014,6 +300311,10 @@
       "166f9e987bf5b3e64df2a0f1c87c29dfdfe97af3",
       []
      ],
+     "bg-color-with-gradient-ref.html": [
+      "5c76f3408aebe6e2964215af3f98745e833e190e",
+      []
+     ],
      "border-bottom-left-radius-004-ref.xht": [
       "15732f1c068b5890c7f65d2e7b561408cccde8e5",
       []
@@ -300528,6 +300829,10 @@
        []
       ]
      },
+     "simple-bg-color-ref.html": [
+      "d8003b58e3ac1c5e917500a59b60c0d2e56287a3",
+      []
+     ],
      "support": {
       "100x100-blue-and-orange.png": [
        "70437d7bda2b56a921b523d4a81ca4df7be4321d",
@@ -300962,10 +301267,14 @@
       "9a329b2446849d8f13b9d88cb5f73934536c3767",
       []
      ],
-     "out-of-flow-in-multicolum-001-ref.html": [
+     "out-of-flow-in-multicolumn-001-ref.html": [
       "7b6a3c50ca82b586450c8912e34141a9bca551e7",
       []
      ],
+     "out-of-flow-in-multicolumn-004-ref.html": [
+      "bc6669e466ba0e4e29bf56b889f59e513f9270c4",
+      []
+     ],
      "reference": {
       "widows-orphans-001-ref.html": [
        "06108ac800c19c68841f2a0e8867fb05e868c1ab",
@@ -311812,8 +312121,12 @@
         "a19e535dabcec2f24b7cc16e2aa7ae92ccfc99d9",
         []
        ],
+       "image-orientation-background-properties-border-radius-ref.html": [
+        "4a7e00c646fae3fe3fdab9cd87fa89b099e70250",
+        []
+       ],
        "image-orientation-background-properties-ref.html": [
-        "0d2aabc4d00d057b1fca18597602847d04513943",
+        "be5edf420b656597af97ca9940eedf5e2e90cbae",
         []
        ],
        "image-orientation-border-image-ref.html": [
@@ -314688,110 +315001,6 @@
       "795e08b8ba22dfaefcf7574f378c3a35aa159025",
       []
      ],
-     "position-sticky-change-top-ref.html": [
-      "8ccc1548ef6abcd82b04e242a747228e47cffd75",
-      []
-     ],
-     "position-sticky-child-multicolumn-ref.html": [
-      "ccbeaa8ca7fd8c8dc301542020cc8ccd96d41da7",
-      []
-     ],
-     "position-sticky-fixed-ancestor-iframe-ref.html": [
-      "37372ceca115e8c641623abb2fb8238b7eaf11db",
-      []
-     ],
-     "position-sticky-fixed-ancestor-ref.html": [
-      "fe404b5babbd0ca32b846f1237df2b9eb298410a",
-      []
-     ],
-     "position-sticky-flexbox-ref.html": [
-      "8f1370e346395fc307bc24325d5a93f861e69ede",
-      []
-     ],
-     "position-sticky-grid-ref.html": [
-      "6f851ef005c6f6784e5a9a483e6ad69310448018",
-      []
-     ],
-     "position-sticky-hyperlink-ref.html": [
-      "0f8100e8888b2e0a6e9ea682ba51281e09996f4f",
-      []
-     ],
-     "position-sticky-inline-ref.html": [
-      "ce0539a9e228e5d578f14cf9506afed79994eaf0",
-      []
-     ],
-     "position-sticky-large-top-2-ref.html": [
-      "941047901df08a616888746d6c0332d69c9382f9",
-      []
-     ],
-     "position-sticky-large-top-ref.html": [
-      "075551a6e856112bb12909684f718b0875fec690",
-      []
-     ],
-     "position-sticky-nested-inline-ref.html": [
-      "c9a5388adf81119f22f85cc797fb7e4db41ee06a",
-      []
-     ],
-     "position-sticky-nested-table-ref.html": [
-      "af67e34c968ec2f9ef0547235dd0f5d1b8d44a19",
-      []
-     ],
-     "position-sticky-rendering-ref.html": [
-      "2924e0804d630ee2080956d0314f4ca69e9bf802",
-      []
-     ],
-     "position-sticky-scroll-reposition-ref.html": [
-      "487a2322fc5aad723458a90e40922331b83bb299",
-      []
-     ],
-     "position-sticky-scroll-with-clip-and-abspos-ref.html": [
-      "a36934e38079cfc8fd6e9d36524968675235983e",
-      []
-     ],
-     "position-sticky-stacking-context-ref.html": [
-      "4385aa545f18069f79e23b4be63f43227e7158aa",
-      []
-     ],
-     "position-sticky-table-parts-ref.html": [
-      "e4f99af7f17c02aebaad3b42322d219df2844cd8",
-      []
-     ],
-     "position-sticky-table-tfoot-bottom-ref.html": [
-      "829adff5a6747fcad58cdf28fd23301fb5b87c31",
-      []
-     ],
-     "position-sticky-table-th-bottom-ref.html": [
-      "2aa5c08a55d29a089d57e4303d893dfd15920abf",
-      []
-     ],
-     "position-sticky-table-th-left-ref.html": [
-      "fe744668e3fec160d18873ef13612b3e546fbde6",
-      []
-     ],
-     "position-sticky-table-th-right-ref.html": [
-      "48a5d1e5f5323c7a60029b011ba8fe8ad721b77a",
-      []
-     ],
-     "position-sticky-table-th-top-ref.html": [
-      "692dbcfdffdc9e23f019a74042feaa5a7eb29736",
-      []
-     ],
-     "position-sticky-table-thead-top-ref.html": [
-      "500265ca3fa29b4474aad63ec9d8174ac7f04e2e",
-      []
-     ],
-     "position-sticky-table-tr-bottom-ref.html": [
-      "a15d475248f9ea4add0f51d7baa971f3bb819f9b",
-      []
-     ],
-     "position-sticky-table-tr-top-ref.html": [
-      "5b5ce478bde8051e7aff4463abad844fa9f04528",
-      []
-     ],
-     "position-sticky-writing-modes-ref.html": [
-      "e92fac0e4650ea407af2bee0ad1678defdcb49ee",
-      []
-     ],
      "resources": {
       "position-sticky-fixed-ancestor-iframe-child.html": [
        "ee91178ff6fb1c9f6b56008a4ebf008786c5fe88",
@@ -314820,6 +315029,112 @@
        []
       ]
      },
+     "sticky": {
+      "position-sticky-change-top-ref.html": [
+       "8ccc1548ef6abcd82b04e242a747228e47cffd75",
+       []
+      ],
+      "position-sticky-child-multicolumn-ref.html": [
+       "ccbeaa8ca7fd8c8dc301542020cc8ccd96d41da7",
+       []
+      ],
+      "position-sticky-fixed-ancestor-iframe-ref.html": [
+       "37372ceca115e8c641623abb2fb8238b7eaf11db",
+       []
+      ],
+      "position-sticky-fixed-ancestor-ref.html": [
+       "fe404b5babbd0ca32b846f1237df2b9eb298410a",
+       []
+      ],
+      "position-sticky-flexbox-ref.html": [
+       "8f1370e346395fc307bc24325d5a93f861e69ede",
+       []
+      ],
+      "position-sticky-grid-ref.html": [
+       "6f851ef005c6f6784e5a9a483e6ad69310448018",
+       []
+      ],
+      "position-sticky-hyperlink-ref.html": [
+       "0f8100e8888b2e0a6e9ea682ba51281e09996f4f",
+       []
+      ],
+      "position-sticky-inline-ref.html": [
+       "ce0539a9e228e5d578f14cf9506afed79994eaf0",
+       []
+      ],
+      "position-sticky-large-top-2-ref.html": [
+       "941047901df08a616888746d6c0332d69c9382f9",
+       []
+      ],
+      "position-sticky-large-top-ref.html": [
+       "075551a6e856112bb12909684f718b0875fec690",
+       []
+      ],
+      "position-sticky-nested-inline-ref.html": [
+       "c9a5388adf81119f22f85cc797fb7e4db41ee06a",
+       []
+      ],
+      "position-sticky-nested-table-ref.html": [
+       "af67e34c968ec2f9ef0547235dd0f5d1b8d44a19",
+       []
+      ],
+      "position-sticky-rendering-ref.html": [
+       "2924e0804d630ee2080956d0314f4ca69e9bf802",
+       []
+      ],
+      "position-sticky-scroll-reposition-ref.html": [
+       "487a2322fc5aad723458a90e40922331b83bb299",
+       []
+      ],
+      "position-sticky-scroll-with-clip-and-abspos-ref.html": [
+       "a36934e38079cfc8fd6e9d36524968675235983e",
+       []
+      ],
+      "position-sticky-stacking-context-ref.html": [
+       "4385aa545f18069f79e23b4be63f43227e7158aa",
+       []
+      ],
+      "position-sticky-table-parts-ref.html": [
+       "e4f99af7f17c02aebaad3b42322d219df2844cd8",
+       []
+      ],
+      "position-sticky-table-tfoot-bottom-ref.html": [
+       "829adff5a6747fcad58cdf28fd23301fb5b87c31",
+       []
+      ],
+      "position-sticky-table-th-bottom-ref.html": [
+       "2aa5c08a55d29a089d57e4303d893dfd15920abf",
+       []
+      ],
+      "position-sticky-table-th-left-ref.html": [
+       "fe744668e3fec160d18873ef13612b3e546fbde6",
+       []
+      ],
+      "position-sticky-table-th-right-ref.html": [
+       "48a5d1e5f5323c7a60029b011ba8fe8ad721b77a",
+       []
+      ],
+      "position-sticky-table-th-top-ref.html": [
+       "692dbcfdffdc9e23f019a74042feaa5a7eb29736",
+       []
+      ],
+      "position-sticky-table-thead-top-ref.html": [
+       "500265ca3fa29b4474aad63ec9d8174ac7f04e2e",
+       []
+      ],
+      "position-sticky-table-tr-bottom-ref.html": [
+       "a15d475248f9ea4add0f51d7baa971f3bb819f9b",
+       []
+      ],
+      "position-sticky-table-tr-top-ref.html": [
+       "5b5ce478bde8051e7aff4463abad844fa9f04528",
+       []
+      ],
+      "position-sticky-writing-modes-ref.html": [
+       "e92fac0e4650ea407af2bee0ad1678defdcb49ee",
+       []
+      ]
+     },
      "z-index-blend-will-change-overlapping-layers-ref.html": [
       "883ffed46d201ed6875adef584b07d892dface49",
       []
@@ -315266,6 +315581,10 @@
        []
       ]
      },
+     "selection-paint-image-notref.html": [
+      "ba1e97dffd8e3cbf1d113b8a68a099dd3fb36824",
+      []
+     ],
      "selection-text-shadow-016-ref.html": [
       "5e3eabc976e2bc75b6a290f2b740b54d8cdbf99a",
       []
@@ -320544,6 +320863,10 @@
       "3441050a59dd521aa2ad061ea514c8a4e90dc244",
       []
      ],
+     "change-scale-wide-range-ref.html": [
+      "264c6b6f25a27f36cdd3ea0bce92c4edb6a2a6aa",
+      []
+     ],
      "composited-under-rotateY-180deg-clip-perspective-ref.html": [
       "ebd2d860cec74ba0d535637934aca8dadf90571d",
       []
@@ -320642,6 +320965,10 @@
        ]
       }
      },
+     "huge-length-tiny-scale-ref.html": [
+      "f3f8abc50e4136a9651183028181894e0daa9e51",
+      []
+     ],
      "individual-transform": {
       "individual-transform-1-ref.html": [
        "dbc5f05d8925a8ddd37c8a6499b0563d4fdaf71e",
@@ -322252,6 +322579,10 @@
       "b326c5f8d2c52f08bc2a09e651ae87f6c005979d",
       []
      ],
+     "resize-child-will-change-transform-ref.html": [
+      "36f39fc19bc193b9037ec53fcb781328983224b4",
+      []
+     ],
      "support": {
       "1x1-red.png": [
        "6bd73ac101874f306d007e9cea8fa3a1f62dce16",
@@ -331613,7 +331944,7 @@
       []
      ],
      "from-web.md": [
-      "fae4c961743f81e5d5cf8a35187a86b02af46fd7",
+      "464febbfc0448d209deebd312c74dcb0a7304d3b",
       []
      ],
      "index.md": [
@@ -334182,11 +334513,11 @@
     "experimental-features": {
      "resources": {
       "common.js": [
-       "c6bea8175129f158f9d2c90c5463cd54f4919a2a",
+       "4266e3949584c48ddcfdf0eb15723894bcdf8093",
        []
       ],
       "feature-policy-trust-token-redemption.html": [
-       "6ae6f6fa4d4684af4b839658ed295d7cfec976cd",
+       "fa5f38b62f7dc0ddf65041d7a1f6b257a09380ad",
        []
       ],
       "focus-without-user-activation-iframe-tentative.html": [
@@ -334340,42 +334671,22 @@
      []
     ],
     "reporting": {
-     "camera-report-only.https.html.headers": [
-      "d7e19c072f7876b0541ac0197411fa0c3dc7c7bd",
-      []
-     ],
      "camera-reporting.https.html.headers": [
       "2adc5e237fcec874767ff8f5ab38e3456c02cbf0",
       []
      ],
-     "encrypted-media-report-only.https.html.headers": [
-      "37e625f31d13dcca90acbccfbcae06f9be3ec5e5",
-      []
-     ],
      "encrypted-media-reporting.https.html.headers": [
       "73753a2e41d10b0a0398831350b1f17e586ab847",
       []
      ],
-     "fullscreen-report-only.html.headers": [
-      "1137afb1a688c7129f88fe432b349f1555027505",
-      []
-     ],
      "fullscreen-reporting.html.headers": [
       "d35e48ba40dc65a3b043a3e41a11332c42bfdba9",
       []
      ],
-     "generic-sensor-report-only.https.html.headers": [
-      "9d49d997f626b35e3ed5d175d0fe82663a6cfb71",
-      []
-     ],
      "generic-sensor-reporting.https.html.headers": [
       "80cc02753044a3730695bce65bc2b4c22d7a8a6b",
       []
      ],
-     "geolocation-report-only.https.html.headers": [
-      "ba0662f577b0a20e16daa75ec9c71998995ef87a",
-      []
-     ],
      "geolocation-reporting.https.html.headers": [
       "7e75481ea6d71080aaef8b43e774f5da9c9741e5",
       []
@@ -334384,66 +334695,34 @@
       "f2b88690fcf182cb0757da947bc6a1295468779f",
       []
      ],
-     "microphone-report-only.https.html.headers": [
-      "5342e71dec8c906fa5d3bf4b3a89317cdeba108c",
-      []
-     ],
      "microphone-reporting.https.html.headers": [
       "a86e0a077851a84f704e2aa4df1d526ecd9a55b2",
       []
      ],
-     "midi-report-only.https.html.headers": [
-      "d307ccc9b09ca486e2ffd85efec14cfdbd285ad4",
-      []
-     ],
      "midi-reporting.https.html.headers": [
       "0e145978a014f08fb5faff42750e9338da0f9ede",
       []
      ],
-     "payment-report-only.https.html.headers": [
-      "dc41987d022b3d46bc7927480dc3174a7fa501ed",
-      []
-     ],
      "payment-reporting.https.html.headers": [
       "a2836778bc5389fdb65e9f6d5f83c7967200866f",
       []
      ],
-     "picture-in-picture-report-only.html.headers": [
-      "b3ec5aaccf0760a02c77e9aefccb51bdc1fb6eca",
-      []
-     ],
      "picture-in-picture-reporting.html.headers": [
       "1759381fdc4141302f1b95868550ead76d9f5ca7",
       []
      ],
-     "screen-wake-lock-report-only.https.html.headers": [
-      "3d729b505638bf5eff87aa091442fff7a73c04fa",
-      []
-     ],
      "screen-wake-lock-reporting.https.html.headers": [
       "5d910ce6df801980a26fb191589201f614ed02af",
       []
      ],
-     "serial-report-only.https.html.headers": [
-      "d408ccf6b15685be3db91c1e19a26bdbc42c78cb",
-      []
-     ],
      "serial-reporting.https.html.headers": [
       "be3e6afd423f767369725724eb3509447c852a59",
       []
      ],
-     "sync-xhr-report-only.html.headers": [
-      "819dc7addcf17138986eb8d9aca26600b5d2642a",
-      []
-     ],
      "sync-xhr-reporting.html.headers": [
       "21a909e1fb6d84f066f42c09488f1bef032171c9",
       []
      ],
-     "usb-report-only.https.html.headers": [
-      "2705af70cee8be148be26ef6e407b18c0de236cd",
-      []
-     ],
      "usb-reporting.https.html.headers": [
       "4fd1e269362c43d282ca8e3c5c35a5d648f0666b",
       []
@@ -334456,10 +334735,6 @@
       "d021af75636de273c868412cd98dfff50576151d",
       []
      ],
-     "xr-report-only.https.html.headers": [
-      "45df4936e27521f3bfa455bf37b498fbbb093fb8",
-      []
-     ],
      "xr-reporting.https.html.headers": [
       "2c758962332e723453f31a6cb8d3dfc3ac292d44",
       []
@@ -334555,7 +334830,7 @@
       []
      ],
      "featurepolicy.js": [
-      "347cba1deea11171ecbc380d1528142434ececb7",
+      "864c434c6633ca7a91de229a7511dd0bd3109add",
       []
      ],
      "nested-sandbox.html": [
@@ -334909,6 +335184,10 @@
     },
     "connection-pool": {
      "resources": {
+      "network-partition-about-blank-checker.html": [
+       "7a8b61323752d2be0e76f70ff3524986ad9f68eb",
+       []
+      ],
       "network-partition-checker.html": [
        "b058f611242bb8cce4571409ef30c8ea0d7ed22f",
        []
@@ -335440,10 +335719,6 @@
       "3849f6ea2cc8d46c6576f7e8f56ce7eb3263dd15",
       []
      ],
-     "activeelement-after-immediately-focusing-same-site-iframe-outer-contenwindow.html": [
-      "bafc26065c8348840cdd3c4c16603bd68f3384ce",
-      []
-     ],
      "activeelement-after-immediately-focusing-same-site-iframe-outer.html": [
       "f22fa98076fde127961c9b58fc5f76db55b21a42",
       []
@@ -336372,7 +336647,7 @@
      []
     ],
     "feature-policy-gamepad.html": [
-     "8ee0c719216904c8d46319ab552d1d8f1ca247a5",
+     "2747a04b34f427b4a27a536dcfcdeae800d652b0",
      []
     ]
    },
@@ -339142,7 +339417,7 @@
          []
         ],
         "text.yaml": [
-         "30a0ad1a6fe5ef721ea91820ed95354c66710582",
+         "b218d2d8b8b8bf253d9f471b1cb58aa8f21d3293",
          []
         ],
         "the-canvas-state.yaml": [
@@ -344455,6 +344730,24 @@
         ]
        }
       },
+      "the-frameset-and-frame-elements": {
+       "reference": {
+        "green-ref.html": [
+         "62208d72c917f09413ffdf6377ac32afe6468a6e",
+         []
+        ]
+       },
+       "resources": {
+        "green.html": [
+         "62208d72c917f09413ffdf6377ac32afe6468a6e",
+         []
+        ],
+        "red.html": [
+         "b5e7f79617d2da46da477c6bff2f6f1b0b84eddb",
+         []
+        ]
+       }
+      },
       "the-hr-element-0": {
        "align-ref.html": [
         "9e4283e208e17e4f2cfed05882bb1aff276028ad",
@@ -346319,7 +346612,7 @@
       },
       "the-dialog-element": {
        "centering-iframe.sub.html": [
-        "2f9721eee86fd5612cc6ccd2686ffbcc86329a72",
+        "01377de42692dd587e4399c2f181836fe412030f",
         []
        ],
        "resources": {
@@ -348719,28 +349012,48 @@
     ]
    },
    "import-maps": {
-    "README.md": [
-     "3803e350c844b4af77b871831817ac0d90aca97f",
+    "META.yml": [
+     "bc6d40ec352178bbc4bf1cacb3753d6b7a10741a",
      []
     ],
-    "common": {
+    "acquiring": {
      "README.md": [
-      "6092c0d767050d0c1b13cfd2360f7a7f17d656a5",
+      "189d19021791bfe393ee96acd1f502784e2ae366",
+      []
+     ]
+    },
+    "bare": {
+     "README.md": [
+      "ce312530ed409d5d7495fe5e2df79baed4fcfa99",
       []
      ],
-     "common-test-service-worker.js": [
-      "6985c901fa683a2585ae28cdb3cd5a9711df8222",
+     "__dir__.headers": [
+      "e7ec0d6699d07e5b13d0cb6f24c3639258fccdaa",
+      []
+     ],
+     "bare": [
+      "1011e866b81dca7bf423fcb48266463c77591465",
+      []
+     ],
+     "cross-origin-bare": [
+      "64851cc8e2455a4cd150b10edf051425bb6dc5bf",
+      []
+     ],
+     "to-bare": [
+      "bdb3791bc9471533434067b826dc59fef07e1c0c",
+      []
+     ],
+     "to-data": [
+      "6f25c5af12412dc6dbb374d4bee0fdd1472f475e",
+      []
+     ]
+    },
+    "data-driven": {
+     "README.md": [
+      "60c415f18633e2bf36d2b2e052ca8ab18493debb",
       []
      ],
      "resources": {
-      "common-test-helper-iframe.js": [
-       "597955fea1f9dc115b6910df59fbb0c5edc1d008",
-       []
-      ],
-      "common-test-helper.js": [
-       "2bf99184a0c9c944551b472a3be6960dbf159128",
-       []
-      ],
       "data-base-url.json": [
        "81fcf087425c70eefa7d3c3465be59684fb1a521",
        []
@@ -348817,6 +349130,14 @@
        "c266e4c6c1d7d9d75efbb0f252e873160d18b0f8",
        []
       ],
+      "test-helper-iframe.js": [
+       "597955fea1f9dc115b6910df59fbb0c5edc1d008",
+       []
+      ],
+      "test-helper.js": [
+       "0f53aea5b4b0507a834c112c1a0595e112d27bbf",
+       []
+      ],
       "tricky-specifiers.json": [
        "d9c80c9475000587643f52d500c0c4d588640f4a",
        []
@@ -348826,6 +349147,10 @@
        []
       ]
      },
+     "service-worker.js": [
+      "68f293bfbfb49796fff247f1259f4d9076b7287e",
+      []
+     ],
      "tools": {
       "format_json.py": [
        "1059ac793aaf2fb5ee875ed9d7e8a02c0040be9e",
@@ -348833,34 +349158,6 @@
       ]
      }
     },
-    "core": {
-     "bare": {
-      "__dir__.headers": [
-       "e7ec0d6699d07e5b13d0cb6f24c3639258fccdaa",
-       []
-      ],
-      "bare": [
-       "1011e866b81dca7bf423fcb48266463c77591465",
-       []
-      ],
-      "cross-origin-bare": [
-       "64851cc8e2455a4cd150b10edf051425bb6dc5bf",
-       []
-      ],
-      "to-bare": [
-       "bdb3791bc9471533434067b826dc59fef07e1c0c",
-       []
-      ],
-      "to-data": [
-       "6f25c5af12412dc6dbb374d4bee0fdd1472f475e",
-       []
-      ]
-     },
-     "static-import.py": [
-      "68583be13c42d88481dd0e9d058bae3ab7eb3995",
-      []
-     ]
-    },
     "resources": {
      "empty.js": [
       "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
@@ -348875,10 +349172,14 @@
       []
      ],
      "test-helper.js": [
-      "3cb278b7989959977c7cca3d645bb61f032701d8",
+      "0e870c26f16f122ebc978e56c76cefea5ecd91ee",
       []
      ]
-    }
+    },
+    "static-import.py": [
+     "fcf823c113ee22cb21283a18e3246d1c5bd72520",
+     []
+    ]
    },
    "inert": {
     "frame": {
@@ -349164,7 +349465,15 @@
          []
         ],
         "penPointerEventProperties.html.ini": [
-         "648585f9e6de573921b56cfbe168f1eb966a8987",
+         "d808b1793cfdbbb5c1acfdd5542c8e96d9de0e3d",
+         []
+        ],
+        "penPointerEvents.html.ini": [
+         "39e05a8f0906b254649a4f4dcedd7c6535045064",
+         []
+        ],
+        "touchPointerEventProperties.html.ini": [
+         "ef77aac0d1f829a0b988140956da4fc62882ab92",
          []
         ],
         "wheelScroll.html.ini": [
@@ -349192,6 +349501,12 @@
         "c01ca2a71990e0045fbab333530f801708b425b6",
         []
        ]
+      },
+      "testharness": {
+       "lone-surrogates.html.ini": [
+        "6505d896a9c195614a89af06af6f9c11b8c5eb7b",
+        []
+       ]
       }
      }
     },
@@ -349264,10 +349579,6 @@
       "iframeChild.html": [
        "a46c54a7b7b51fec65d335ad54fc8fb4ca4c2050",
        []
-      ],
-      "pointerevent_pointermove_in_pointerlock.html.ini": [
-       "0c21bf5b526d6ab982ef6e4c6dd6699bafaa6177",
-       []
       ]
      },
      "click_child.html": [
@@ -349320,7 +349631,7 @@
      []
     ],
     "input-events-get-target-ranges.js": [
-     "a957678c50fd98f414f41c8d46987d72b3c96f57",
+     "6b922cdf03930ace471c9df2ddb58f74b1b24850",
      []
     ]
    },
@@ -349366,7 +349677,7 @@
      []
     ],
     "WebCryptoAPI.idl": [
-     "246c1547bb97ea88675d0223340be85060242f34",
+     "d7fce62d5b0003a1e9bda89cd63b5bc758f5d2ea",
      []
     ],
     "WebIDL.idl": [
@@ -349542,7 +349853,7 @@
      []
     ],
     "dom.idl": [
-     "ffc5b063219d4d41b07ca1ff087fb118ed030117",
+     "d404be2aea5fc78ffccd4533213f47f6b76cff8f",
      []
     ],
     "element-timing.idl": [
@@ -349862,7 +350173,7 @@
      []
     ],
     "scroll-animations.idl": [
-     "3ef9f5452906509e5c9bc88bdaf31fbf2b3ff8a8",
+     "efa986d93e351bcb6b4816b51f587c4ed6efa1ba",
      []
     ],
     "scroll-to-text-fragment.idl": [
@@ -350277,7 +350588,7 @@
     ]
    },
    "lint.ignore": [
-    "2d0508fd9ba180ff4909a3d4e5c8cb1e195eb854",
+    "07c6fb7b85cbe5e2892b247032addc23b20f97e1",
     []
    ],
    "loading": {
@@ -351535,7 +351846,7 @@
     ],
     "support": {
      "MediaRecorder-iframe.html": [
-      "6e70acf4862cc2c0f10d0b2642994bf04f794e44",
+      "df60c4e8e18d18a15c07c7acda00edc39318711d",
       []
      ]
     },
@@ -351543,6 +351854,10 @@
      "peerconnection.js": [
       "817095e981f7724ba4d8a9f1cec26d2b4b7e3b4d",
       []
+     ],
+     "sources.js": [
+      "44947272d6348c25399a2994928e22eb2c7b9b83",
+      []
      ]
     }
    },
@@ -352952,7 +353267,7 @@
     "experimental-features": {
      "resources": {
       "common.js": [
-       "de25ce710891e93833c1b936f190bd76eb473a4d",
+       "308f787da63d147b00356cf4817f8c33b162c6cb",
        []
       ],
       "focus-without-user-activation-iframe-tentative.html": [
@@ -352968,7 +353283,7 @@
        []
       ],
       "permissions-policy-trust-token-redemption.html": [
-       "329f0faa0d32c365f110ef14cf8f04523bb03835",
+       "7ad0ace57d4d08179dca6618cc1bb30b11efb55d",
        []
       ],
       "vertical-scroll-scrollable-content.html": [
@@ -353277,7 +353592,7 @@
       []
      ],
      "permissions-policy.js": [
-      "1c5bf97b50c36fbb443d282e252d0346d2db2491",
+      "ea6d47a089a06af4154a857f0cab7fafa50b1b61",
       []
      ],
      "picture-in-picture.js": [
@@ -355727,7 +356042,7 @@
       []
      ],
      "generic_sensor_mocks.js": [
-      "ff11ca1ab0bc3b77075618fe5b5798425152c5ed",
+      "85891c6ef129d31794404476d25878c7eb8c5bd7",
       []
      ],
      "generic_sensor_mocks.js.headers": [
@@ -356205,7 +356520,7 @@
         []
        ],
        "helpers.js": [
-        "b273a72589f7d334de58ee780abbc4c0f4e22ebd",
+        "ca378a27c9152742f751d0b9c5c276f48a21560c",
         []
        ],
        "late-test.html": [
@@ -356233,7 +356548,7 @@
         []
        ],
        "unpaired-surrogates.html": [
-        "1b162fe71d283d63dbdaac5b3be887f5cd80d53f",
+        "b23211132659eef1c50b046e0a15bc06f6bebfc3",
         []
        ]
       }
@@ -356268,7 +356583,7 @@
      []
     ],
     "testdriver-actions.js": [
-     "f3e6388e8acd1998d89750150e0779df327a5417",
+     "4dafa0c018b101563e99643ec0c896fb14ed9840",
      []
     ],
     "testdriver-vendor.js": [
@@ -356288,7 +356603,7 @@
      []
     ],
     "testharness.js": [
-     "d50e094117df56db49d75f1620c4aba51319fc3c",
+     "f7fe7531710d235976d036e4b022f21d53b286b1",
      []
     ],
     "testharness.js.headers": [
@@ -356422,7 +356737,7 @@
      ]
     },
     "testcommon.js": [
-     "d9fc153887c5fcbe839aeddb90f16d63a7bed868",
+     "9b3e82228fcdb3ad666ff611b57430e5dedab94c",
      []
     ]
    },
@@ -356435,6 +356750,10 @@
      "73858969e02e64e97f1cc50a84935eeeb9068dfe",
      []
     ],
+    "find-range-from-text-directive-target.html": [
+     "8e119d6448a6072dbc822dd3ad06b235e569d9b7",
+     []
+    ],
     "force-load-at-top-target.html": [
      "72feec8a4086283f2df5af5994dafc79f93d387b",
      []
@@ -360489,11 +360808,11 @@
       []
      ],
      "cacert.key": [
-      "3a3e487a83de0f5676e481e7240b68107b7ee34e",
+      "1c1ca2bc110002bb5ad5f2315b8953a37a2592d9",
       []
      ],
      "cacert.pem": [
-      "e9b5fda55c380cf8850f4b94524b62055c9ca360",
+      "a9383d0cf00bb59ccf7341a8639d9cc646312e1b",
       []
      ],
      "config.json": [
@@ -360501,11 +360820,11 @@
       []
      ],
      "web-platform.test.key": [
-      "957dfb234f8b90ebb40a1fb48d58623875f2e03d",
+      "4e557404ab2bf093d93fae5c37446cc0e309cfe5",
       []
      ],
      "web-platform.test.pem": [
-      "61d7e4d189266500efb379da960eafbb38aca530",
+      "7c58aa67f0a40337c133906289b586fc7c9c97c7",
       []
      ]
     },
@@ -360789,7 +361108,7 @@
       []
      ],
      "gitignore.py": [
-      "2a2761518663ca949011fa3dc7dd7fc390f7936c",
+      "dbe83c27eee78d4be2488faab4e0f7166e2c99bc",
       []
      ],
      "tests": {
@@ -361062,12 +361381,16 @@
       "9a43a68f1fbcc97715c5446b823f022596d6cb01",
       []
      ],
+     "jsonlib.py": [
+      "e7f07c3ad2a2dd4356758ac84ad54cf198b76296",
+      []
+     ],
      "log.py": [
       "9e2ad74081e4a1b38b9c3c3ba61d49be2e8151fd",
       []
      ],
      "manifest.py": [
-      "449cd245acbc599389a76cd71f1f8ae29323066b",
+      "14d3844d461cd7e0d7a071dd957ad2829885a3c6",
       []
      ],
      "sourcefile.py": [
@@ -361117,12 +361440,12 @@
       []
      ],
      "vcs.py": [
-      "344575276b42cb33ebb1d81f5e1a21eac39db2e6",
+      "4f3bfdaf124402b1a71750f9e99e1373034b2881",
       []
      ]
     },
     "mypy.ini": [
-     "b943b6d089a4b8f81e9b6e23c76880fb93cf665a",
+     "4d352302d80e3207d2a33d3130a359de3e53df09",
      []
     ],
     "py27-flake8.ini": [
@@ -367044,7 +367367,7 @@
        []
       ],
       "client.py": [
-       "f4e3c763795e905a85f3c41951f86e558b7c1073",
+       "73fec5a892523b8965deead70a39eb02ffc01242",
        []
       ],
       "error.py": [
@@ -367071,7 +367394,7 @@
       []
      ],
      "browser.py": [
-      "86bb19b599370c63058c9ea255ff3c2f354cabfa",
+      "800080e91e6d423658acb2d69dca157c5623c68e",
       []
      ],
      "commands.json": [
@@ -367165,7 +367488,7 @@
       []
      ],
      "wpt.py": [
-      "efa985c7cc1740eb0fd6e5a80f9e89e24cf75d37",
+      "9bc6ce6ce9e89f3f0f423d01081125a4a6f6adec",
       []
      ]
     },
@@ -367205,63 +367528,63 @@
       ]
      },
      "requirements.txt": [
-      "4893d7bd628949bdcbe6f8ba54daba1fd46bdf3e",
+      "766b9bd914391f558de2e28999cbfcc3f16db8ca",
       []
      ],
      "requirements_android_webview.txt": [
-      "e7e7161b14264a29cc5d9cf4a275abeb7fcbace6",
+      "874980b338a7e86c8227d76ff050b47af52661e0",
       []
      ],
      "requirements_chrome.txt": [
-      "e7e7161b14264a29cc5d9cf4a275abeb7fcbace6",
+      "874980b338a7e86c8227d76ff050b47af52661e0",
       []
      ],
      "requirements_chrome_android.txt": [
-      "e7e7161b14264a29cc5d9cf4a275abeb7fcbace6",
+      "874980b338a7e86c8227d76ff050b47af52661e0",
       []
      ],
      "requirements_chrome_ios.txt": [
-      "e7e7161b14264a29cc5d9cf4a275abeb7fcbace6",
+      "874980b338a7e86c8227d76ff050b47af52661e0",
       []
      ],
      "requirements_edge.txt": [
-      "0a61208d77c1279ac2b1b301702867f2d5d0fc67",
+      "0ef64c232bcba36fc863ec59168af56cf79824dc",
       []
      ],
      "requirements_edge_chromium.txt": [
-      "3f1ee1f6b20ac5a30d160d9c321358d93c681cef",
+      "1c7736b98b1bc4c6428642c58d51635481003d6b",
       []
      ],
      "requirements_epiphany.txt": [
-      "e7e7161b14264a29cc5d9cf4a275abeb7fcbace6",
+      "874980b338a7e86c8227d76ff050b47af52661e0",
       []
      ],
      "requirements_firefox.txt": [
-      "5585609e5c3de329db9d97c134ea793287b66d03",
+      "373466dae07e95943d91f330832bf82dc118f0d7",
       []
      ],
      "requirements_ie.txt": [
-      "0a61208d77c1279ac2b1b301702867f2d5d0fc67",
+      "0ef64c232bcba36fc863ec59168af56cf79824dc",
       []
      ],
      "requirements_opera.txt": [
-      "0a61208d77c1279ac2b1b301702867f2d5d0fc67",
+      "0ef64c232bcba36fc863ec59168af56cf79824dc",
       []
      ],
      "requirements_safari.txt": [
-      "e7e7161b14264a29cc5d9cf4a275abeb7fcbace6",
+      "874980b338a7e86c8227d76ff050b47af52661e0",
       []
      ],
      "requirements_sauce.txt": [
-      "34c66ee238b67f9be30cf2330df8d943f374e247",
+      "d363945f54fc1b84fdc9ddc58560637ee050881c",
       []
      ],
      "requirements_servo.txt": [
-      "e7e7161b14264a29cc5d9cf4a275abeb7fcbace6",
+      "874980b338a7e86c8227d76ff050b47af52661e0",
       []
      ],
      "requirements_webkit.txt": [
-      "e7e7161b14264a29cc5d9cf4a275abeb7fcbace6",
+      "874980b338a7e86c8227d76ff050b47af52661e0",
       []
      ],
      "setup.py": [
@@ -367441,7 +367764,7 @@
         []
        ],
        "chrome_spki_certs.py": [
-        "c6e583581882dbabe817600b1f1047e48a0d1dcb",
+        "071d53e9e4eea9b458681e4697610a8539fb114c",
         []
        ],
        "edge.py": [
@@ -367461,7 +367784,7 @@
         []
        ],
        "firefox.py": [
-        "75cebb9f7f103daa0e35d96fddc67d7a1d49fd27",
+        "e95bc93deca0ef0f825e9d7997450f16a7353819",
         []
        ],
        "firefox_android.py": [
@@ -367801,7 +368124,7 @@
         []
        ],
        "state.py": [
-        "bdb23fed99e19fa55abeec7202a3a1b471bedc03",
+        "6b6ff1a7e08bc0c85a339c7b075e973fe87baca8",
         []
        ],
        "sync.py": [
@@ -370172,7 +370495,7 @@
        []
       ],
       "conftest.py": [
-       "970f7b7dd9be42356b64c5082862e11abbe80c68",
+       "188f8ddbb5ef742b91c192775f3c9f7fd59aea7a",
        []
       ],
       "support": {
@@ -370192,6 +370515,10 @@
         "d5d24e934f61684be8512d120a4853bff7efadef",
         []
        ],
+       "test_actions_pointer_wdspec.html": [
+        "f1fd9b2da3f860a4c2afcd4176bfc2aee067d2f8",
+        []
+       ],
        "test_actions_scroll_wdspec.html": [
         "b6e281e581816f7f42b5e92387adc3047fa4f891",
         []
@@ -374227,7 +374554,7 @@
     }
    },
    "wpt": [
-    "329ea66852cb8f4dac846af30ebbccb1e68fd29d",
+    "9fea20d0d9b7f1528a478fd5d26f6dff65fb4b3f",
     []
    ],
    "wpt.py": [
@@ -401827,7 +402154,7 @@
        ]
       ],
       "CSS-supports-CSSStyleDeclaration.html": [
-       "3a9786c510dedc80cf7a5af143960fbeb7a09371",
+       "fd013b95e8af97da3772fc5b9978c0082c57cdb2",
        [
         null,
         {}
@@ -402052,6 +402379,13 @@
         {}
        ]
       ],
+      "content-visibility-077.tentative.html": [
+       "7cc9a335035678f9cf9f0514eaf700198553f889",
+       [
+        null,
+        {}
+       ]
+      ],
       "inheritance.html": [
        "e1ae8164de00467a450511da9ca4bf7f138e9c71",
        [
@@ -409359,6 +409693,13 @@
        {}
       ]
      ],
+     "hit-test-transformed-child.html": [
+      "ac0fd54c9f35dda0f01f5b8eb92fd7df7a3b5bb7",
+      [
+       null,
+       {}
+      ]
+     ],
      "inheritance.html": [
       "e7938d3e9ffa2d21c57e4565283911431e56f17e",
       [
@@ -410435,153 +410776,155 @@
        {}
       ]
      ],
-     "position-sticky-bottom.html": [
-      "ba23f0145cf497c4d21b36f387d2017acf45bf34",
-      [
-       null,
-       {}
+     "sticky": {
+      "position-sticky-bottom.html": [
+       "9cfae6d3ba9bdeafa2ff6fcd820dc2c3fdb13660",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-get-bounding-client-rect.html": [
+       "18b2acfe16f77f3242b51e3a64c9b39d6a4f50b5",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-inflow-position.html": [
+       "a6774b7a71c2609551d2ff3bc44133918fc472cc",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-input-box-gets-focused-after-scroll.html": [
+       "5b2d705e2d0721c072bedf1dcc489fae25b2014f",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-left.html": [
+       "1fc2e8f88dadb0a04352c08016985f92bbdb5c31",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-margins.html": [
+       "7a9cf09faa6a9dcc169d47bba8af79ebf64a5a67",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-nested-bottom.html": [
+       "b9b73cc486f6924c07429ba3d78889d3f78df3a4",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-nested-left.html": [
+       "b92d45319b10350cde5ba949b3ec9e86527566e6",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-nested-right.html": [
+       "f5314224b2b7654b705066c8d38be9ee98ec641d",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-nested-top.html": [
+       "90dc52dba8e2403d75c9869ada0e635faba74887",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-offset-overflow.html": [
+       "f4afed406ae8cc1af0aa4dd6b379ba3335a70f26",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-offset-top-left.html": [
+       "ade9e108cf45039173066cedec39462fa37e5d95",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-overflow-hidden.html": [
+       "622ca8fbef54b2d33bfda686e108ad5780ec0bdb",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-overflow-padding.html": [
+       "71b74e7886b8660fd66f9d6a40f7bdad666c849a",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-parsing.html": [
+       "f6f587e615f5759f7a706a57defdd8bfaa836aa6",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-right.html": [
+       "82d0e9af1db9383621843f5f1a51e7485073e5bb",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-root-scroller.html": [
+       "596fd9b24054bc0c3f0579146834d6fef674d6cf",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-scrolled-remove-sibling.html": [
+       "f2cf8a98b30a2c19a986d31bc4da99f0bdd8df9d",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-top.html": [
+       "9929fc734bab4c9816200bdb04e859eedd11b110",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-transforms-translate.html": [
+       "fb2ca6b85f9fc913422e9a52275a457c1a774b7c",
+       [
+        null,
+        {}
+       ]
+      ],
+      "position-sticky-transforms.html": [
+       "080f05a4ebf8ac538098204c01cc10a1e95d168e",
+       [
+        null,
+        {}
+       ]
       ]
-     ],
-     "position-sticky-get-bounding-client-rect.html": [
-      "18b2acfe16f77f3242b51e3a64c9b39d6a4f50b5",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-inflow-position.html": [
-      "a6774b7a71c2609551d2ff3bc44133918fc472cc",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-input-box-gets-focused-after-scroll.html": [
-      "5b2d705e2d0721c072bedf1dcc489fae25b2014f",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-left.html": [
-      "054cf10eabc256cde34fc738d9fcd7429946849c",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-margins.html": [
-      "b2d9944bb6d4ae22d7d5bc142440500650b9aad2",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-nested-bottom.html": [
-      "edea11fe132b853a31cf3784b6d742d969043c45",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-nested-left.html": [
-      "755b69ac3c590ba3ccb6c3c436b5e97c1a6036b3",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-nested-right.html": [
-      "9878aa774d8cffb22d1094665dd4aa9bd53c2617",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-nested-top.html": [
-      "5332b46cd0ccba4c08a411f744586daa8b99f334",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-offset-overflow.html": [
-      "f4afed406ae8cc1af0aa4dd6b379ba3335a70f26",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-offset-top-left.html": [
-      "ade9e108cf45039173066cedec39462fa37e5d95",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-overflow-hidden.html": [
-      "b1dc49f34fe0cd5386e41acedc179e9d1af90ecb",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-overflow-padding.html": [
-      "fab6f2f731a5ac4acf13fff10b3d47470e7a7d05",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-parsing.html": [
-      "f6f587e615f5759f7a706a57defdd8bfaa836aa6",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-right.html": [
-      "d280a1f3fdd47e0cb89e4827e4c320ea420ebf5d",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-root-scroller.html": [
-      "596fd9b24054bc0c3f0579146834d6fef674d6cf",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-scrolled-remove-sibling.html": [
-      "f2cf8a98b30a2c19a986d31bc4da99f0bdd8df9d",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-top.html": [
-      "e4889d14802ed15be9ebaa102c52a54676f6b3db",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-transforms-translate.html": [
-      "791b035ef3c8e5dd9eefb182d66a13ebd829dc27",
-      [
-       null,
-       {}
-      ]
-     ],
-     "position-sticky-transforms.html": [
-      "9f18d587b57a16efdcbe1d25a943815419a03543",
-      [
-       null,
-       {}
-      ]
-     ]
+     }
     },
     "css-properties-values-api": {
      "at-property-animation.html": [
@@ -413160,6 +413503,13 @@
        {}
       ]
      ],
+     "intrinsic-size-fallback-replaced.html": [
+      "aaac6482410c6219ca854c7fe9a36c427c7b4942",
+      [
+       null,
+       {}
+      ]
+     ],
      "min-max-content-orthogonal-flow-crash-001.html": [
       "d2617f8aa2d1c966e394abb1d1617c012ea4648e",
       [
@@ -422830,6 +423180,13 @@
        {}
       ]
      ],
+     "elementFromPoint-float-in-relative.html": [
+      "275fe29fb7c645a2fe860d6a4e1a236e81cbdc11",
+      [
+       null,
+       {}
+      ]
+     ],
      "elementFromPoint-float-in-table.html": [
       "73713382eacfeba0d46a39165793f5906f15a2eb",
       [
@@ -426225,6 +426582,13 @@
    },
    "dom": {
     "abort": {
+     "addEventListenerAbortController.tentative.html": [
+      "36373507c192c2f642165772facae1e308ac289d",
+      [
+       null,
+       {}
+      ]
+     ],
      "event.any.js": [
       "a67e6f400fcf1dfa347390e1a76e25b573afbb9a",
       [
@@ -429581,7 +429945,7 @@
       ]
      ],
      "select-all-and-delete-in-html-element-having-contenteditable.html": [
-      "e8eb5e5e1abf53e61eac1e6fe871935a8ee14e5c",
+      "ab324c6d034b0ca975dfc6eba72e36ab0fbb2a7e",
       [
        null,
        {
@@ -443220,7 +443584,7 @@
       ]
      ],
      "trust-token-redemption-default-feature-policy.tentative.https.sub.html": [
-      "d88048953ea3f1d26dee502ef331bc3f07ec0152",
+      "134ccc084d643dbc75adc0466f2f44248ab0efc6",
       [
        null,
        {}
@@ -443258,7 +443622,7 @@
      ]
     },
     "feature-policy-frame-policy-allowed-for-all.https.sub.html": [
-     "aede7e7876b197417d4fb6f156fda3285ac7e9a4",
+     "63cd9853dcedac46bff5ddb1554d519ed4a64c23",
      [
       null,
       {
@@ -443267,7 +443631,7 @@
      ]
     ],
     "feature-policy-frame-policy-allowed-for-self.https.sub.html": [
-     "b2b668256ff745bf41c26443b0703b76eab736cf",
+     "9cf56ec79869341af0f927c1c9586ab33a8da46e",
      [
       null,
       {
@@ -443276,7 +443640,7 @@
      ]
     ],
     "feature-policy-frame-policy-allowed-for-some-override.https.sub.html": [
-     "17c9cc6b8dbbb67891871874a5632b3cbaa89b3a",
+     "744c9502480c47fc069ec47c4c6c25d7f905804c",
      [
       null,
       {
@@ -443285,7 +443649,7 @@
      ]
     ],
     "feature-policy-frame-policy-allowed-for-some.https.sub.html": [
-     "d519743a4384c7242d849c011cf02e835eecd2ba",
+     "5dfd8430d2f5772c0d5b3149fc0b1dbfcd0c96f6",
      [
       null,
       {
@@ -443310,7 +443674,7 @@
      ]
     ],
     "feature-policy-header-policy-allowed-for-all.https.sub.html": [
-     "6bf7ca65326a8a5a146b2f5c399b7adbce527805",
+     "bfbdd6a20c93dc013d0008cf8b80bbcd7aee00a6",
      [
       null,
       {}
@@ -443324,14 +443688,14 @@
      ]
     ],
     "feature-policy-header-policy-allowed-for-some.https.sub.html": [
-     "e07c51fefd9cc7002cf01667b2e7885ba19a3907",
+     "d89ccef5c90676f0a682dbf07a3da20d3f017a83",
      [
       null,
       {}
      ]
     ],
     "feature-policy-header-policy-declined.https.sub.html": [
-     "d00d592d9ac4688f015d9edccc5cb683f3c496ad",
+     "ebe09ec9873d6ef2c1946e0c408d9582923889cc",
      [
       null,
       {}
@@ -443345,7 +443709,7 @@
      ]
     ],
     "feature-policy-nested-header-policy-allowed-for-all.https.sub.html": [
-     "fb62660519032dff1222a69923292f924233be62",
+     "184cd01342351276d7a06d53fc596176e53381dc",
      [
       null,
       {
@@ -443354,7 +443718,7 @@
      ]
     ],
     "feature-policy-nested-header-policy-allowed-for-self.https.sub.html": [
-     "62ddd967495a251bcb76988d9236429af6cc8691",
+     "fe857c916ce49de2692f6d501f50ab4e9f687a13",
      [
       null,
       {
@@ -443409,7 +443773,7 @@
      ]
     ],
     "payment-allowed-by-feature-policy.https.sub.html": [
-     "ccb6740d6a2d96825e44c33aaaa90db71df30206",
+     "b69fa62c053cdfb92f143c095eae5a3d73022bd1",
      [
       null,
       {}
@@ -443510,15 +443874,6 @@
      ]
     ],
     "reporting": {
-     "camera-report-only.https.html": [
-      "c22e1a51740d4b27bcc4ae0efa4bdb0c4b8fcf39",
-      [
-       null,
-       {
-        "testdriver": true
-       }
-      ]
-     ],
      "camera-reporting.https.html": [
       "12b48dccb73c2bd5954996c0e005511a436320a1",
       [
@@ -443526,13 +443881,6 @@
        {}
       ]
      ],
-     "encrypted-media-report-only.https.html": [
-      "9ab4b0fe8569db905d44e7482bda5ad9804f3d28",
-      [
-       null,
-       {}
-      ]
-     ],
      "encrypted-media-reporting.https.html": [
       "1f891a57801d2ebeac87b24d4ffae1a21aba6b20",
       [
@@ -443540,15 +443888,6 @@
        {}
       ]
      ],
-     "fullscreen-report-only.html": [
-      "48fe9e3a69a81c9aac283b75d5498f406e968768",
-      [
-       null,
-       {
-        "testdriver": true
-       }
-      ]
-     ],
      "fullscreen-reporting.html": [
       "3ac1ef40ccef608af92f489b0218228933af664e",
       [
@@ -443556,13 +443895,6 @@
        {}
       ]
      ],
-     "generic-sensor-report-only.https.html": [
-      "6c8c2efbf6c322466498c4cb80300333b88fda25",
-      [
-       null,
-       {}
-      ]
-     ],
      "generic-sensor-reporting.https.html": [
       "9a5d404d34525fe5786d9b09d8fbc4eca287df2d",
       [
@@ -443570,13 +443902,6 @@
        {}
       ]
      ],
-     "geolocation-report-only.https.html": [
-      "6c62b622cda70c5e23ecc0d80811eaabfe539ca1",
-      [
-       null,
-       {}
-      ]
-     ],
      "geolocation-reporting.https.html": [
       "fe8761f803bdfd795698fd28e89ed9f442c1a7fc",
       [
@@ -443584,15 +443909,6 @@
        {}
       ]
      ],
-     "microphone-report-only.https.html": [
-      "539994cd70a2b5a8d598577a0d493c13346755b8",
-      [
-       null,
-       {
-        "testdriver": true
-       }
-      ]
-     ],
      "microphone-reporting.https.html": [
       "2aeba8194e46a9f129d457cb2d7ce3e8137a8b64",
       [
@@ -443600,13 +443916,6 @@
        {}
       ]
      ],
-     "midi-report-only.https.html": [
-      "bf0234d3f6511f4ecfeb43857494e4dee0666b79",
-      [
-       null,
-       {}
-      ]
-     ],
      "midi-reporting.https.html": [
       "9e8a6ebf8e8f8dccdf8b809dd3e08ba1ed84f3ef",
       [
@@ -443614,13 +443923,6 @@
        {}
       ]
      ],
-     "payment-report-only.https.html": [
-      "d2b8e5ee9cc017d3012a2cdd79143230495b4544",
-      [
-       null,
-       {}
-      ]
-     ],
      "payment-reporting.https.html": [
       "417dfed7dce289a636b6308378d1d7eac0c843e1",
       [
@@ -443628,15 +443930,6 @@
        {}
       ]
      ],
-     "picture-in-picture-report-only.html": [
-      "9e113a92429bc49bbf70bed6a0ffa7a28f105fce",
-      [
-       null,
-       {
-        "testdriver": true
-       }
-      ]
-     ],
      "picture-in-picture-reporting.html": [
       "d1c641d81d7cb2df4ea8125f7e66bccfd7dca6c2",
       [
@@ -443646,15 +443939,6 @@
        }
       ]
      ],
-     "screen-wake-lock-report-only.https.html": [
-      "51aa4f90c5f6e26156e095af8ee9e5aa639072ce",
-      [
-       null,
-       {
-        "testdriver": true
-       }
-      ]
-     ],
      "screen-wake-lock-reporting.https.html": [
       "ce0cbdca77ad99041d6e51b04bb277fae9426890",
       [
@@ -443662,15 +443946,6 @@
        {}
       ]
      ],
-     "serial-report-only.https.html": [
-      "11913a2ef77159c3f0c4769cd3cfaf09d942f1ba",
-      [
-       null,
-       {
-        "testdriver": true
-       }
-      ]
-     ],
      "serial-reporting.https.html": [
       "827bc89367c56141938d962edcfe69452309b8f3",
       [
@@ -443680,13 +443955,6 @@
        }
       ]
      ],
-     "sync-xhr-report-only.html": [
-      "76d26ed502743549fe426703eef4da38a4076f64",
-      [
-       null,
-       {}
-      ]
-     ],
      "sync-xhr-reporting.html": [
       "dbdcc126ec44fecc712b18f874f35aef9d9d8369",
       [
@@ -443694,15 +443962,6 @@
        {}
       ]
      ],
-     "usb-report-only.https.html": [
-      "7933e9eb5f6c15c513d4110a689eae8c3c15a0ab",
-      [
-       null,
-       {
-        "testdriver": true
-       }
-      ]
-     ],
      "usb-reporting.https.html": [
       "a63f3010e4e64ca8aa94f0752c368906bf2c04ea",
       [
@@ -443724,13 +443983,6 @@
        {}
       ]
      ],
-     "xr-report-only.https.html": [
-      "872db22849545c174b385543e4e12747574a34af",
-      [
-       null,
-       {}
-      ]
-     ],
      "xr-reporting.https.html": [
       "3d629235d732124e914872555fd4be3ac9421ecd",
       [
@@ -453769,14 +454021,14 @@
    },
    "gamepad": {
     "gamepad-default-feature-policy.https.sub.html": [
-     "fce0eaffee308992f29d626438ef6002f0f69aef",
+     "347f40b2a4e56ea11d743270512dadfdafe67983",
      [
       null,
       {}
      ]
     ],
     "gamepad-secure-context.html": [
-     "97b4ea2967eed3fbb5588ac0010b1dbf42ba19c8",
+     "034595ebdb627313c29532c7ecd1d647031ff049",
      [
       null,
       {}
@@ -472347,28 +472599,28 @@
         ]
        ],
        "2d.text.draw.align.end.ltr.html": [
-        "8b01fbbc8c4066e271cbf4825c11176c12a8e35c",
+        "1f1a23eed935614bbbef47ae1dffdec2f5f4ddf8",
         [
          null,
          {}
         ]
        ],
        "2d.text.draw.align.end.ltr.worker.js": [
-        "c84308c7f0716d789273021942a594ddae431cd4",
+        "b3705520b1694b5b3a6184e25ea8502d4ddb433b",
         [
          "html/canvas/offscreen/text/2d.text.draw.align.end.ltr.worker.html",
          {}
         ]
        ],
        "2d.text.draw.align.end.rtl.html": [
-        "0cf7b5756ae0a4f094274600ad33776394d97cc1",
+        "f18e4974ba1543172a997ce3775b091dd984dd55",
         [
          null,
          {}
         ]
        ],
        "2d.text.draw.align.end.rtl.worker.js": [
-        "6845dd474d61786aa89f288a52d9c03ed1881fcb",
+        "a0561c1f8063300908e7a874f6f73b5f244c12d6",
         [
          "html/canvas/offscreen/text/2d.text.draw.align.end.rtl.worker.html",
          {}
@@ -472403,28 +472655,28 @@
         ]
        ],
        "2d.text.draw.align.start.ltr.html": [
-        "301b6dc4522d913746b98daaecae592e3f116c9b",
+        "08c222b9a59f559f3d3640903da6ed87903a491d",
         [
          null,
          {}
         ]
        ],
        "2d.text.draw.align.start.ltr.worker.js": [
-        "4e7db42542be076ff53bd42a6787542437c2cc42",
+        "1cefdd0cfa63025ce193426716b5f9ee65bfe105",
         [
          "html/canvas/offscreen/text/2d.text.draw.align.start.ltr.worker.html",
          {}
         ]
        ],
        "2d.text.draw.align.start.rtl.html": [
-        "27723f23efc1dff14c719aca0b81afc0acdf1eea",
+        "3d9670abc30ae3bfdfb043c82c8e75c9db5f330b",
         [
          null,
          {}
         ]
        ],
        "2d.text.draw.align.start.rtl.worker.js": [
-        "545c1d9c27d222a0824e5858d7f48d2158bbd67f",
+        "2cc818fc9282f54badc39ffbd506dff7993e0c3c",
         [
          "html/canvas/offscreen/text/2d.text.draw.align.start.rtl.worker.html",
          {}
@@ -474288,7 +474540,7 @@
       ]
      ],
      "cross-origin-isolated-permission.https.html": [
-      "2fc545d5acb69dc21684418cb24e4830d4c9bb9c",
+      "31c0a913338e014a569f945c39e5edbae50e594d",
       [
        null,
        {}
@@ -477813,7 +478065,7 @@
         ]
        ],
        "dialog.html": [
-        "f8e28ceb6462953652a30ed6e4048b735006c633",
+        "3588e036708babbdcf0d5984f2e01aa821fdad03",
         [
          null,
          {}
@@ -485222,14 +485474,14 @@
       },
       "the-dialog-element": {
        "abspos-dialog-layout.html": [
-        "00665f66cec6887da0065d5caae887d1438b41a6",
+        "e5453d73ee86f1d3ccacbb6a84562c402df10d28",
         [
          null,
          {}
         ]
        ],
        "centering.html": [
-        "4c97ea078c51da6e960c90d3c957f000bc9d7e37",
+        "62f4fc2519c9622d81a0434055d47a1d587757e6",
         [
          null,
          {}
@@ -485300,13 +485552,6 @@
          {}
         ]
        ],
-       "dialog-scrolled-viewport.html": [
-        "8a59ba23e4331cc591d9e1f4f447694eb18d276d",
-        [
-         null,
-         {}
-        ]
-       ],
        "dialog-showModal-remove.html": [
         "c2350c304249dcb9478e62725936275ec0fda383",
         [
@@ -490689,6 +490934,16 @@
      }
     },
     "user-activation": {
+     "activation-thru-contextmenu-event.html": [
+      "7f84577b7f0f121314c835be9544008ec381b9a4",
+      [
+       null,
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ]
+     ],
      "basic.html": [
       "fe8cebc1089e6a5b15eb24ec0e3a9b2eb284c796",
       [
@@ -493081,156 +493336,148 @@
     ]
    },
    "import-maps": {
-    "acquire-import-maps-flag": {
-     "dynamic-import": {
-      "success.tentative.html": [
-       "512cd7fa6974e802dab6bff4c190774a76d7cbf1",
-       [
-        null,
-        {}
-       ]
-      ]
-     },
-     "script-tag": {
-      "success.tentative.html": [
-       "7f319b04758f8dbfd688f10b6a86be16d6bb720f",
-       [
-        null,
-        {}
-       ]
-      ]
-     },
-     "worker-request": {
-      "success.tentative.html": [
-       "ceef4100aad01f5cd5959086aacf83665f60c805",
-       [
-        null,
-        {}
-       ]
-      ]
-     }
-    },
-    "common": {
-     "parsing.tentative.https.html": [
-      "0dc9e24c8d84ddf06ef38f874605a20712cda214",
-      [
-       null,
-       {
-        "timeout": "long"
-       }
-      ]
-     ],
-     "resolving-internal.tentative.https.html": [
-      "a9f7c82fd879ca557afd2db85d35901e066e919b",
-      [
-       null,
-       {
-        "timeout": "long"
-       }
-      ]
-     ],
-     "resolving.tentative.https.html": [
-      "abb30e0afa4f41c306d2a5b1eee788bdd94390bb",
-      [
-       null,
-       {
-        "timeout": "long"
-       }
-      ]
-     ]
-    },
-    "core": {
-     "bare.sub.tentative.html": [
-      "7fb769e09a2af432517522f91a2a101efc484ad8",
-      [
-       null,
-       {
-        "timeout": "long"
-       }
-      ]
-     ],
-     "data.sub.tentative.html": [
-      "25c18c45b7dc3e7311247fc945eb08a75185085f",
-      [
-       null,
-       {
-        "timeout": "long"
-       }
-      ]
-     ],
-     "http.sub.tentative.html": [
-      "a33a0945e316711a4338045f53ab71d91121c8f6",
+    "acquiring": {
+     "dynamic-import.html": [
+      "49d8a701da2e436ccdded0f7438c3dc11f6c4656",
       [
        null,
        {}
       ]
      ],
-     "module-map-key.tentative.html": [
-      "6f2f18a02e12a92530b7a3ae6bbbd31eecff3816",
+     "script-tag.html": [
+      "2792c2a31d971809195b46f7c9c870ca446b0e51",
       [
        null,
        {}
       ]
      ],
-     "not-as-classic-script.html": [
-      "5f97394e4408bc8db5624e5d0c6f1b2fa1b028dd",
+     "worker-request.html": [
+      "05474ddff2b6d20399ce9918a8734a7307a7fa4a",
       [
        null,
        {}
       ]
      ]
     },
+    "bare-specifiers.sub.html": [
+     "d087cb31c447051c405619d1292e368cbbbf40bc",
+     [
+      null,
+      {
+       "timeout": "long"
+      }
+     ]
+    ],
     "csp": {
-     "applied-to-target-dynamic.sub.tentative.html": [
+     "applied-to-target-dynamic.sub.html": [
       "2c73803206141256bb3fba3f6b26fbdf005d2da8",
       [
        null,
        {}
       ]
      ],
-     "applied-to-target.sub.tentative.html": [
+     "applied-to-target.sub.html": [
       "e6bbfecd0d9a62b5d4262c3cdbc7f97c301aa686",
       [
        null,
        {}
       ]
      ],
-     "hash-failure.tentative.html": [
+     "hash-failure.html": [
       "4bab1ed91731a362d02602a4e5a58e6272a3fd66",
       [
        null,
        {}
       ]
      ],
-     "hash.tentative.html": [
+     "hash.html": [
       "868c5beb81b45dbf2ce07548427f8547accaeec4",
       [
        null,
        {}
       ]
      ],
-     "nonce-failure.tentative.html": [
+     "nonce-failure.html": [
       "a1661a432ab57534fee650b4b15009ea1c8a13cd",
       [
        null,
        {}
       ]
      ],
-     "nonce.tentative.html": [
+     "nonce.html": [
       "858c572214fb482398707a7b7bd45cf7021a8d94",
       [
        null,
        {}
       ]
      ],
-     "unsafe-inline.tentative.html": [
+     "unsafe-inline.html": [
       "101c33cf84e9fb5e68cf8d5910f4ffbe7949e9d7",
       [
        null,
        {}
       ]
      ]
-    }
+    },
+    "data-driven": {
+     "parsing-internal.https.html": [
+      "7d45ae8c33bd1f9d11616b3a14085ee8aa218aca",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
+     "resolving-internal.https.html": [
+      "887b7474d63ad4b05c7c99b2e756e01958c12c16",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
+     "resolving.https.html": [
+      "40b7ef5dae5010cf39b1df38e3dce5b96c3d62df",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ]
+    },
+    "data-url-specifiers.sub.html": [
+     "a6fa12c12662eb4a225ea65cf3cabf2453c12a2e",
+     [
+      null,
+      {
+       "timeout": "long"
+      }
+     ]
+    ],
+    "http-url-like-specifiers.sub.html": [
+     "ba5182354cbcdda4386eea7730701a45460c443c",
+     [
+      null,
+      {}
+     ]
+    ],
+    "module-map-key.html": [
+     "3bf15934aa5cb52be50f4ea3fa6d6dc593cb1d1d",
+     [
+      null,
+      {}
+     ]
+    ],
+    "not-as-classic-script.html": [
+     "5f97394e4408bc8db5624e5d0c6f1b2fa1b028dd",
+     [
+      null,
+      {}
+     ]
+    ]
    },
    "inert": {
     "inert-does-not-match-disabled-selector.tentative.html": [
@@ -493881,6 +494128,15 @@
        ]
       ],
       "penPointerEventProperties.html": [
+       "ba6c15f022539cd1ec86c23559064e205746c5b1",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
+      "penPointerEvents.html": [
        "c5a2b1c06d902d54f63b329ef3f5253b5d72ff04",
        [
         null,
@@ -493889,6 +494145,15 @@
         }
        ]
       ],
+      "touchPointerEventProperties.html": [
+       "b636dfde7970fa33a1392c62e0bfed36006f79f4",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
       "wheelScroll.html": [
        "a7d9b2609da763dbfaacab253edb13ca35c16627",
        [
@@ -494007,6 +494272,15 @@
        }
       ]
      ]
+    },
+    "testharness": {
+     "lone-surrogates.html": [
+      "fb842ecc9e4e6ed685eef9aa5611a2872d460a64",
+      [
+       null,
+       {}
+      ]
+     ]
     }
    },
    "input-device-capabilities": {
@@ -494061,7 +494335,7 @@
      ]
     ],
     "input-events-get-target-ranges-backspace.tentative.html": [
-     "71db5e7287844dce1deb97c6cef753ac053bc27b",
+     "bd2621d988f3ff99d655bc0b73d45a03562a3f0e",
      [
       null,
       {
@@ -494080,7 +494354,7 @@
      ]
     ],
     "input-events-get-target-ranges-forwarddelete.tentative.html": [
-     "bbc76f43fbcdd837d31e610958867e1abdfbd7b5",
+     "440e37dcade0cec5f7ab3e466072177f08ec09f0",
      [
       null,
       {
@@ -494090,7 +494364,7 @@
      ]
     ],
     "input-events-get-target-ranges-non-collapsed-selection.tentative.html": [
-     "2e16d2a4c3acf5c2794ed312bafc75d003d52588",
+     "b8732327dad4a8ee8570ca03400f9376112c53c7",
      [
       "input-events/input-events-get-target-ranges-non-collapsed-selection.tentative.html?Backspace",
       {
@@ -498258,7 +498532,7 @@
      ]
     ],
     "MediaRecorder-destroy-script-execution.html": [
-     "1710d238b6e31d285766f25f4625d206d1d8a1fc",
+     "6375004d36b2816c1a5e54c403d33e24fe386e1a",
      [
       null,
       {}
@@ -498279,21 +498553,21 @@
      ]
     ],
     "MediaRecorder-error.html": [
-     "1c93ed3e3a6ab82504e926486e4edb741cc2e4b6",
+     "54e83ecac767525e84ce8f1ae38f935c6bac2f7d",
      [
       null,
       {}
      ]
     ],
     "MediaRecorder-events-and-exceptions.html": [
-     "d5abf3a05c3584df3a19735a24030141a1b13010",
+     "0a377991ba0f875fe47975f30a193af60baf5092",
      [
       null,
       {}
      ]
     ],
     "MediaRecorder-mimetype.html": [
-     "8b98977dda2f4d1d0d6d3e121bb03304122c5eac",
+     "07721abfd42cf9a9dc57fa6729f8c5da053d52c8",
      [
       null,
       {}
@@ -498307,7 +498581,7 @@
      ]
     ],
     "MediaRecorder-pause-resume.html": [
-     "33dfd8560c04d9e9de335b13cfcb33428a6b7e24",
+     "39f98cc85a17d14c65b274f3925497b8c85d92cc",
      [
       null,
       {}
@@ -498323,7 +498597,7 @@
      ]
     ],
     "MediaRecorder-stop.html": [
-     "7e19bc0c054472fdf8161bff41f99f2e601c0abb",
+     "73eb2999adb238f49f886d5de0dbe8f5eebae63f",
      [
       null,
       {}
@@ -506083,7 +506357,7 @@
       ]
      ],
      "trust-token-redemption-default-permissions-policy.tentative.https.sub.html": [
-      "8adc0c398edbeb1311ef5391b10f6f4865ee9cdb",
+      "20736879105b72053e48b16fbd5528743f9199a0",
       [
        null,
        {}
@@ -506142,7 +506416,7 @@
      ]
     ],
     "payment-allowed-by-permissions-policy.https.sub.html": [
-     "cb619bc225a52f901373890f371d3c89942ea5dc",
+     "456626c350feaefdc92c227952bb95a62573a94b",
      [
       null,
       {}
@@ -506222,7 +506496,7 @@
      ]
     ],
     "permissions-policy-header-policy-allowed-for-all.https.sub.html": [
-     "d91132599fc018c989a961ca906ce68988af9e40",
+     "a089866c7af7ac4a798844cff3fd1a938bb5cede",
      [
       null,
       {}
@@ -506236,14 +506510,14 @@
      ]
     ],
     "permissions-policy-header-policy-allowed-for-some.https.sub.html": [
-     "1e999a5e5e58328648f394b91a517cb861866a23",
+     "0035eea7d5e04e1155d452246925a7a7560fd951",
      [
       null,
       {}
      ]
     ],
     "permissions-policy-header-policy-declined.https.sub.html": [
-     "8455d68c0713d5c86b02610224194b42dc8ce9d0",
+     "247f23893ba09cbe2639c4df01aa70b4fa553595",
      [
       null,
       {}
@@ -506257,7 +506531,7 @@
      ]
     ],
     "permissions-policy-nested-header-policy-allowed-for-all.https.sub.html": [
-     "74ff64c51d26983403203a537a558d4da18e790e",
+     "46ca378d0b9f9d451c0566b8169daa26093cb7b3",
      [
       null,
       {
@@ -506266,7 +506540,7 @@
      ]
     ],
     "permissions-policy-nested-header-policy-allowed-for-self.https.sub.html": [
-     "f1e5f9d2e24a2dbe8f260d1638040e0651b1a04c",
+     "54c6e95b6ed4b12b381251bec84846211aecf04d",
      [
       null,
       {
@@ -506344,7 +506618,7 @@
     ],
     "reporting": {
      "camera-report-only.https.html": [
-      "c22e1a51740d4b27bcc4ae0efa4bdb0c4b8fcf39",
+      "5c6658bab86ed8955797dfe938511a909d05b038",
       [
        null,
        {
@@ -506353,28 +506627,28 @@
       ]
      ],
      "camera-reporting.https.html": [
-      "12b48dccb73c2bd5954996c0e005511a436320a1",
+      "ec7965faf543d7238aa880782cc8627fe9ae15fb",
       [
        null,
        {}
       ]
      ],
      "encrypted-media-report-only.https.html": [
-      "9ab4b0fe8569db905d44e7482bda5ad9804f3d28",
+      "72a1ca236826c7486a94742bbc26e238769cec43",
       [
        null,
        {}
       ]
      ],
      "encrypted-media-reporting.https.html": [
-      "1f891a57801d2ebeac87b24d4ffae1a21aba6b20",
+      "32a5a2cc4876a8d95e0fdeaa06752e54f714fd64",
       [
        null,
        {}
       ]
      ],
      "fullscreen-report-only.html": [
-      "48fe9e3a69a81c9aac283b75d5498f406e968768",
+      "caf31f6b790df0c98c22c4521a40b3b5c8819544",
       [
        null,
        {
@@ -506383,42 +506657,42 @@
       ]
      ],
      "fullscreen-reporting.html": [
-      "3ac1ef40ccef608af92f489b0218228933af664e",
+      "d7b905744d6ab32bb67492897e387cdf3465784d",
       [
        null,
        {}
       ]
      ],
      "generic-sensor-report-only.https.html": [
-      "6c8c2efbf6c322466498c4cb80300333b88fda25",
+      "21fb850391bb5f69bdc53d6ed88676ae3241513f",
       [
        null,
        {}
       ]
      ],
      "generic-sensor-reporting.https.html": [
-      "9a5d404d34525fe5786d9b09d8fbc4eca287df2d",
+      "c29c069ee3c6e62b1d71cbaee650959ab1a49fe9",
       [
        null,
        {}
       ]
      ],
      "geolocation-report-only.https.html": [
-      "6c62b622cda70c5e23ecc0d80811eaabfe539ca1",
+      "abffd62cfc73089438b8e33b0243b91b86eaaf88",
       [
        null,
        {}
       ]
      ],
      "geolocation-reporting.https.html": [
-      "fe8761f803bdfd795698fd28e89ed9f442c1a7fc",
+      "e0eb275bcc2bca296f9d5e8d3df505b0e1671489",
       [
        null,
        {}
       ]
      ],
      "microphone-report-only.https.html": [
-      "539994cd70a2b5a8d598577a0d493c13346755b8",
+      "29e9388fc872f9ef88f1cb1be8d6b1697ea964f1",
       [
        null,
        {
@@ -506427,42 +506701,42 @@
       ]
      ],
      "microphone-reporting.https.html": [
-      "2aeba8194e46a9f129d457cb2d7ce3e8137a8b64",
+      "13df0c148dec0cf53647a136713d994658eec8f4",
       [
        null,
        {}
       ]
      ],
      "midi-report-only.https.html": [
-      "bf0234d3f6511f4ecfeb43857494e4dee0666b79",
+      "3aa12dcfb5c4d326680b3b1f57556538fb084168",
       [
        null,
        {}
       ]
      ],
      "midi-reporting.https.html": [
-      "9e8a6ebf8e8f8dccdf8b809dd3e08ba1ed84f3ef",
+      "6cc07f53715f0766eddee0d954c1189c5e38e263",
       [
        null,
        {}
       ]
      ],
      "payment-report-only.https.html": [
-      "d2b8e5ee9cc017d3012a2cdd79143230495b4544",
+      "f5105c3b00041d8f77f4440bbefc95e6452aeb77",
       [
        null,
        {}
       ]
      ],
      "payment-reporting.https.html": [
-      "50972baacb94c0d02e0471c5a5275e16db13d800",
+      "72529bf9f19b2c6a2db8c30d410ba2b4b5f65400",
       [
        null,
        {}
       ]
      ],
      "picture-in-picture-report-only.html": [
-      "9e113a92429bc49bbf70bed6a0ffa7a28f105fce",
+      "0caa2ae953b3b550e15f90d01fb1836755ef1851",
       [
        null,
        {
@@ -506471,7 +506745,7 @@
       ]
      ],
      "picture-in-picture-reporting.html": [
-      "d1c641d81d7cb2df4ea8125f7e66bccfd7dca6c2",
+      "177e4d5c02adc62f6ceaa20c36659331cac2df75",
       [
        null,
        {
@@ -506480,7 +506754,7 @@
       ]
      ],
      "serial-report-only.https.html": [
-      "11913a2ef77159c3f0c4769cd3cfaf09d942f1ba",
+      "3a410362dedf12bf48398383644bd017463b3f1f",
       [
        null,
        {
@@ -506489,7 +506763,7 @@
       ]
      ],
      "serial-reporting.https.html": [
-      "827bc89367c56141938d962edcfe69452309b8f3",
+      "c96d8f878a98a0366ce34c3f4fe62b7a91708717",
       [
        null,
        {
@@ -506498,21 +506772,21 @@
       ]
      ],
      "sync-xhr-report-only.html": [
-      "76d26ed502743549fe426703eef4da38a4076f64",
+      "29b1368a2e9ec327c2845668bb84f01f354568d3",
       [
        null,
        {}
       ]
      ],
      "sync-xhr-reporting.html": [
-      "5427bfd6859680e8b8781f7b9adfc24f7f1370d9",
+      "a8fdb09ecee7c83238cebe77ebc61b3b06c9a970",
       [
        null,
        {}
       ]
      ],
      "usb-report-only.https.html": [
-      "7933e9eb5f6c15c513d4110a689eae8c3c15a0ab",
+      "5a96531115890bf27ef46e37d3dd80278216ec7c",
       [
        null,
        {
@@ -506521,21 +506795,21 @@
       ]
      ],
      "usb-reporting.https.html": [
-      "a63f3010e4e64ca8aa94f0752c368906bf2c04ea",
+      "1ec5ba43709279a43a09f890a321b4df6659308e",
       [
        null,
        {}
       ]
      ],
      "xr-report-only.https.html": [
-      "ead03d6a9f6757a6be2fd8e18f9017ba433b550a",
+      "f39ecf34326147a05959ff35ab33f209dd9bf4b5",
       [
        null,
        {}
       ]
      ],
      "xr-reporting.https.html": [
-      "3d629235d732124e914872555fd4be3ac9421ecd",
+      "d87d4fb028dd05c15e4f27c58baf21f23d746519",
       [
        null,
        {}
@@ -520457,6 +520731,13 @@
       {}
      ]
     ],
+    "progress-based-current-time.tenative.html": [
+     "8a8ccfcff8b2bae66d59ed2525f5b6c1eee7480b",
+     [
+      null,
+      {}
+     ]
+    ],
     "reverse-animation.html": [
      "95c772e30a8ca7ed4a68941540a2df77b5c25c43",
      [
@@ -520554,6 +520835,16 @@
     ]
    },
    "scroll-to-text-fragment": {
+    "find-range-from-text-directive.html": [
+     "ce05a92b2125dad0dfac13c7ca5f94b72cb5d810",
+     [
+      null,
+      {
+       "testdriver": true,
+       "timeout": "long"
+      }
+     ]
+    ],
     "force-load-at-top.html": [
      "1399de3d624927131c21ef9bf548825de4b059a4",
      [
@@ -523470,28 +523761,28 @@
       ]
      ],
      "declarative-shadow-dom-attachment.tentative.html": [
-      "73b43829f1a093140a83b92e383e9a02ad3b4a6f",
+      "99a255bfa2187dd394de252ed5670a0d95896795",
       [
        null,
        {}
       ]
      ],
      "declarative-shadow-dom-basic.tentative.html": [
-      "f17e304fe75995b492a23dfdf082a0f5e5bc48c6",
+      "aaca71b9580b5b73927ad45c1f46b4faa83bbbf0",
       [
        null,
        {}
       ]
      ],
      "declarative-shadow-dom-opt-in.tentative.html": [
-      "e023477c9f5014d474b69d850084e834fcde649b",
+      "eb87fc95e712e1ef2362f388d762f8598c761bd7",
       [
        null,
        {}
       ]
      ],
      "getinnerhtml.tentative.html": [
-      "2f8ecad418b818f35220550479f9c02e1889744e",
+      "64fd78ba8ed0ca4d465c5a3ef8cb496350c69f7c",
       [
        null,
        {}
@@ -523524,6 +523815,13 @@
        null,
        {}
       ]
+     ],
+     "setinnerhtml.tentative.html": [
+      "f99863c7c1fabfbaee11d5cc90cc81d3e4acebff",
+      [
+       null,
+       {}
+      ]
      ]
     },
     "event-composed-path-after-dom-mutation.html": [
@@ -526918,7 +527216,7 @@
       ]
      ],
      "general.any.js": [
-      "e384dbc5c7944bc75ce2a014476c5367d157fe7b",
+      "8ae6af70efd6c9ba08b8affdfafb7b74307072e1",
       [
        null,
        {
@@ -531272,21 +531570,21 @@
       ]
      ],
      "svglength-animation-invalid-value-1.html": [
-      "9b45c5a8ca0dd1fec4aad07c02e6bbc7caad0a3a",
+      "90a45efa32045efad2f01c7e675ee45db802fda1",
       [
        null,
        {}
       ]
      ],
      "svglength-animation-invalid-value-2.html": [
-      "64d5884df44bc1334da2750b0c23ce52e0ad5028",
+      "f9a6bcc40d1425080cfa7793d99011a07a6d9572",
       [
        null,
        {}
       ]
      ],
      "svglength-animation-invalid-value-3.html": [
-      "0fb1794eaa2c738e17ba42a63c478d877e52de29",
+      "1e16245001a5354ec6304651e3dbdd29a60c5485",
       [
        null,
        {}
@@ -533281,14 +533579,14 @@
      ]
     },
     "trust-token-parameter-validation-xhr.tentative.https.html": [
-     "0ee538c07e63a744ca8764c6fc67fc5fcbcd2696",
+     "52d72301be9379a05df9aaec7b0719697bbc1d81",
      [
       null,
       {}
      ]
     ],
     "trust-token-parameter-validation.tentative.https.html": [
-     "733873e538ccafc15ade66e2139828dc5a3da05d",
+     "2ed88dd2456d771ddc43621aac581181f1480adf",
      [
       null,
       {}
@@ -533758,7 +534056,7 @@
      ]
     ],
     "require-trusted-types-for.tentative.html": [
-     "2a3820a89b8ad36c324139bf75fab8d72d7087a4",
+     "bf3dedd978c3810e24e61454086977dfbbca1237",
      [
       null,
       {}
@@ -543874,7 +544172,7 @@
      ]
     ],
     "video-encoder.html": [
-     "20b01a93299b0730a4f80130e6a8e24c95b72d17",
+     "1e723d42bf1ac0e3beb55baa32c3feffeae86ae3",
      [
       null,
       {}
@@ -581410,7 +581708,7 @@
        ]
       ],
       "pointer.py": [
-       "ad546921460e53842da8071679e9154a61d661f7",
+       "1cb824fc8ecf130d64fe65fe60a7745654dc2480",
        [
         null,
         {
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
deleted file mode 100644
index f29da48a2a0..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-003.html]
-  [Miss float below something else]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini b/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
index 076c791cd3d..94a3570d26b 100644
--- a/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
+++ b/tests/wpt/metadata/css/CSS2/linebox/inline-negative-margin-001.html.ini
@@ -8,9 +8,6 @@
   [[data-expected-height\] 3]
     expected: FAIL
 
-  [[data-expected-height\] 1]
-    expected: FAIL
-
-  [[data-expected-height\] 2]
+  [[data-expected-height\] 4]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html.ini b/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html.ini
new file mode 100644
index 00000000000..d7080b90fcf
--- /dev/null
+++ b/tests/wpt/metadata/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html.ini
@@ -0,0 +1,2 @@
+[image-orientation-background-properties-border-radius.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transforms/change-scale-wide-range.html.ini b/tests/wpt/metadata/css/css-transforms/change-scale-wide-range.html.ini
new file mode 100644
index 00000000000..48a4ed0c771
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transforms/change-scale-wide-range.html.ini
@@ -0,0 +1,2 @@
+[change-scale-wide-range.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
deleted file mode 100644
index e38782d8c85..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementFromPoint-001.html]
-  [CSSOM View - 5 - extensions to the Document interface]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini
new file mode 100644
index 00000000000..fa416a1a5eb
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-float-in-relative.html.ini
@@ -0,0 +1,4 @@
+[elementFromPoint-float-in-relative.html]
+  [elementFromPoint-float-in-relative]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
index 85e94926cb3..5733d536fd3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPosition.html.ini
@@ -21,3 +21,6 @@
   [test the top of layer]
     expected: FAIL
 
+  [test some point of the element: top left corner]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
new file mode 100644
index 00000000000..e181af5397f
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
@@ -0,0 +1,4 @@
+[elementsFromPoint-invalid-cases.html]
+  [The root element is the last element returned for otherwise empty queries within the viewport]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/dom/abort/addEventListenerAbortController.tentative.html.ini b/tests/wpt/metadata/dom/abort/addEventListenerAbortController.tentative.html.ini
new file mode 100644
index 00000000000..60f56e372f7
--- /dev/null
+++ b/tests/wpt/metadata/dom/abort/addEventListenerAbortController.tentative.html.ini
@@ -0,0 +1,4 @@
+[addEventListenerAbortController.tentative.html]
+  [Tests support for EventController to cancel event listeners in addEventListener.]
+    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 260fde6a810..0ee5bde6d70 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -324,9 +324,15 @@
   [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
+  [<iframe>: separate response Content-Type: text/plain */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 2003288747e..2d5faa72ac7 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -53,12 +53,6 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript x/x]
-    expected: FAIL
-
   [separate text/javascript;charset=windows-1252 error text/javascript]
     expected: FAIL
 
-  [separate text/javascript ]
-    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 b290d442952..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,9 +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%22nosniFF%22]
-    expected: FAIL
-
-  [Content-Type-Options%3A%20nosniff]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/gamepad/gamepad-secure-context.html.ini b/tests/wpt/metadata/gamepad/gamepad-secure-context.html.ini
index 177c9715232..664014e3d71 100644
--- a/tests/wpt/metadata/gamepad/gamepad-secure-context.html.ini
+++ b/tests/wpt/metadata/gamepad/gamepad-secure-context.html.ini
@@ -2,3 +2,6 @@
   [When in a non-secure context, getGamepad() should throw an error.]
     expected: FAIL
 
+  [Gamepad API is not exposed in insecure contexts]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
new file mode 100644
index 00000000000..51f8272a6de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_3.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_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/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 442db3cb549..2532dceabac 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,4 +1,5 @@
 [embedded-opener-remove-frame.html]
+  expected: CRASH
   [opener and "removed" embedded documents]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index 44dc9ffabc4..d1ca01ebc5f 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -1,20 +1,17 @@
 [supported-elements.html]
   expected: TIMEOUT
   [Contenteditable element should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Element with tabindex should support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [Host element with delegatesFocus should support autofocus]
-    expected: NOTRUN
-
-  [Non-HTMLElement should not support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-abssize.html.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-abssize.html.ini
new file mode 100644
index 00000000000..ea0621c13b8
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-abssize.html.ini
@@ -0,0 +1,2 @@
+[large-cols-abssize.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-percentage.html.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-percentage.html.ini
new file mode 100644
index 00000000000..75a2253cc8b
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-percentage.html.ini
@@ -0,0 +1,2 @@
+[large-cols-percentage.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-relsize.html.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-relsize.html.ini
new file mode 100644
index 00000000000..493a31521f4
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-relsize.html.ini
@@ -0,0 +1,2 @@
+[large-cols-relsize.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-abssize.html.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-abssize.html.ini
new file mode 100644
index 00000000000..af360ef7603
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-abssize.html.ini
@@ -0,0 +1,2 @@
+[large-rows-abssize.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-percentage.html.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-percentage.html.ini
new file mode 100644
index 00000000000..9aaee252bb8
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-percentage.html.ini
@@ -0,0 +1,2 @@
+[large-rows-percentage.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-relsize.html.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-relsize.html.ini
new file mode 100644
index 00000000000..3243f718f4b
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-relsize.html.ini
@@ -0,0 +1,2 @@
+[large-rows-relsize.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 98163335e40..1de3f8d68b2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -172,6 +172,3 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
-  [HTML (standards) IMG usemap="no-hash-name"]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 86fee8a454a..fc37df7e3fa 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index c6f45be1eb2..e63fe7c263e 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index 9df1ac56f2a..3f7e3e9544f 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_nonescaping-1.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html.ini
index 6cfa67fcebc..29d2d3f2b5e 100644
--- a/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html.ini
+++ b/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html.ini
@@ -41,3 +41,6 @@
   [A dialog with specified 'bottom' should be positioned as usual]
     expected: FAIL
 
+  [Dialog should still be centered when removed, and re-added to the document.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/centering.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/centering.html.ini
index d0861d00287..30d17843edd 100644
--- a/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/centering.html.ini
+++ b/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/centering.html.ini
@@ -9,9 +9,6 @@
   [horizontal-tb: square viewport]
     expected: FAIL
 
-  [horizontal-tb: dialog and viewport match]
-    expected: FAIL
-
   [horizontal-tb: dialog bigger than viewport]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/dialog-scrolled-viewport.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/dialog-scrolled-viewport.html.ini
deleted file mode 100644
index 998744525b3..00000000000
--- a/tests/wpt/metadata/html/semantics/interactive-elements/the-dialog-element/dialog-scrolled-viewport.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[dialog-scrolled-viewport.html]
-  [Tests modal dialog's containing block is the initial containing block]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index edae5e5adcd..0cef5158fae 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -4,6 +4,3 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
-  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index 66bd350083b..a56bad443a2 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,4 +1,5 @@
 [realtimeanalyser-fft-scaling.html]
+  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 894deb69e20..2c9c3b4e994 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
@@ -491,3 +491,9 @@
   [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-9.3167430000000000e+6\t9.3139332532882690e-1\t9.3167439313933253e+6\t1.0003017713385550e+7\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3167439313933253e+6 at index of 28696.\n\tMax RelError of 1.0003017713385550e+7 at index of 28696.\n]
     expected: FAIL
 
+  [X SNR (-384.5345319359717 dB) is not greater than or equal to 65.737. Got -384.5345319359717.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[28696\]\t-2.5028273606901356e+21\t9.3139332532882690e-1\t2.5028273606901356e+21\t2.6871862752575734e+21\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 2.5028273606901356e+21 at index of 28696.\n\tMax RelError of 2.6871862752575734e+21 at index of 28696.\n]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/web-platform-tests/.azure-pipelines.yml b/tests/wpt/web-platform-tests/.azure-pipelines.yml
index 882b63058dc..412822c7edb 100644
--- a/tests/wpt/web-platform-tests/.azure-pipelines.yml
+++ b/tests/wpt/web-platform-tests/.azure-pipelines.yml
@@ -79,6 +79,8 @@ jobs:
   steps:
   - template: tools/ci/azure/checkout.yml
   - script: |
+      set -euo pipefail
+      git fetch --depth 50 --quiet origin master
       ./wpt test-jobs | while read job; do
         echo "$job"
         echo "##vso[task.setvariable variable=$job;isOutput=true]true";
diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/crashtests/inline-block-baseline-crash.html b/tests/wpt/web-platform-tests/css/CSS2/linebox/crashtests/inline-block-baseline-crash.html
new file mode 100644
index 00000000000..8c88583c55b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/linebox/crashtests/inline-block-baseline-crash.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css2/#propdef-vertical-align">
+<link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
+<style>
+div::after {
+  display: layout(parent);
+  content: "";
+}
+</style>
+<body style="columns: 2">
+  <div style="display: inline-block"></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/composite-bgcolor-animation/bg-color-with-gradient-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/bg-color-with-gradient-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/composite-bgcolor-animation/bg-color-with-gradient-ref.html
rename to tests/wpt/web-platform-tests/css/css-backgrounds/bg-color-with-gradient-ref.html
diff --git a/tests/wpt/web-platform-tests/css/composite-bgcolor-animation/bg-color-with-gradient.html b/tests/wpt/web-platform-tests/css/css-backgrounds/bg-color-with-gradient.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/composite-bgcolor-animation/bg-color-with-gradient.html
rename to tests/wpt/web-platform-tests/css/css-backgrounds/bg-color-with-gradient.html
diff --git a/tests/wpt/web-platform-tests/css/composite-bgcolor-animation/simple-bg-color-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/simple-bg-color-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/composite-bgcolor-animation/simple-bg-color-ref.html
rename to tests/wpt/web-platform-tests/css/css-backgrounds/simple-bg-color-ref.html
diff --git a/tests/wpt/web-platform-tests/css/composite-bgcolor-animation/simple-bg-color.html b/tests/wpt/web-platform-tests/css/css-backgrounds/simple-bg-color.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/composite-bgcolor-animation/simple-bg-color.html
rename to tests/wpt/web-platform-tests/css/css-backgrounds/simple-bg-color.html
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolum-001-ref.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-001-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolum-001-ref.html
rename to tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-001-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-001.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-001.html
index 148f39467f7..370561f3362 100644
--- a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-001.html
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-001.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <link rel="author" title="Benjamin Beaudry" href="mailto:bebeaudr@microsoft.com">
 <link rel="help" href="href=https://www.w3.org/TR/css-break-3/#break-decoration">
-<link rel="match" href="out-of-flow-in-multicolum-001-ref.html">
+<link rel="match" href="out-of-flow-in-multicolumn-001-ref.html">
 
 <p>The abs element should be split equally into the two columns - no red!</p>
 <style>
@@ -36,4 +36,4 @@
         <div class="abs"></div>
       </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-003.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-003.html
new file mode 100644
index 00000000000..1eac0b9a67f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-003.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<link rel="help" href="href=https://www.w3.org/TR/css-break-3/#break-decoration">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<!-- Tests that empty column fragments are added if an OOF element begins layout
+     in a fragmentainer that is more than one index beyond the last existing
+     column fragmentainer. -->
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<style>
+  #multicol {
+    column-count: 2;
+    column-fill: auto;
+    column-gap: 0px;
+    height: 100px;
+    width: 100px;
+    /* Move the multicolumn left to account for the first three empty columns */
+    position: relative;
+    left: -150px;
+  }
+  .rel {
+    position: relative;
+  }
+  .abs {
+    position: absolute;
+    top: 300px;
+    width: 50px;
+    height: 200px;
+    background: green;
+  }
+</style>
+<div id="multicol">
+  <div class="rel">
+    <div class="abs"></div>
+  </div>
+</div>
+
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-004-ref.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-004-ref.html
new file mode 100644
index 00000000000..bc6669e466b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-004-ref.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<!-- Simulate two multi-column containers with an out-of-flow positioned child that
+     fragments, even in the presence of break-inside: avoid and break-before: column. -->
+<style>
+.initial {
+  float: left;
+  height: 20px;
+  width: 20px;
+  background: blue;
+}
+.first-fragment {
+  width: 40px;
+  height: 20px;
+  background: green;
+  margin-top: 10px;
+}
+.second-fragment {
+  width: 40px;
+  height: 10px;
+  background: green;
+  margin-left: 50px;
+}
+</style>
+<div class="initial"></div>
+<div class="second-fragment"></div>
+<div class="first-fragment"></div>
+<div class="initial"></div>
+<div class="second-fragment"></div>
+<div class="first-fragment"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-004.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-004.html
new file mode 100644
index 00000000000..86ffa50d269
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-004.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<link rel="help" href="href=https://www.w3.org/TR/css-break-3/#breaking-controls">
+<link rel="match" href="out-of-flow-in-multicolumn-004-ref.html">
+<!-- break-inside: avoid and break-before: column do not apply to absolute positioned elements. -->
+<style>
+  #multicol {
+    column-count: 2;
+    column-fill: auto;
+    column-gap: 0px;
+    height: 40px;
+    width: 100px;
+  }
+  .rel {
+    position: relative;
+  }
+  .abs {
+    position: absolute;
+    width: 40px;
+    height: 30px;
+    background: green;
+  }
+  .content {
+    width: 20px;
+    height: 20px;
+    background: blue;
+  }
+  .inside {
+    break-inside: avoid;
+  }
+  .before {
+    break-before: column;
+  }
+</style>
+<div id="multicol">
+  <div class="content"></div>
+  <div class="rel">
+    <div class="abs inside"></div>
+  </div>
+</div>
+<div id="multicol">
+  <div class="content"></div>
+  <div class="rel">
+    <div class="abs before"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-005.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-005.html
new file mode 100644
index 00000000000..6f9a1641be6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-005.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<link rel="help" href="href=https://www.w3.org/TR/css-break-3/#breaking-controls">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<!-- break-after: column does not apply to absolute positioned elements. -->
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<style>
+  #multicol {
+    column-count: 2;
+    column-fill: auto;
+    column-gap: 10px;
+    height: 100px;
+    width: 200px;
+  }
+  .rel {
+    position: relative;
+    height: 10px;
+    width: 100px;
+    background: green;
+  }
+  .abs {
+    position: absolute;
+    width: 40px;
+    height: 30px;
+    break-after: column;
+  }
+  .content {
+    width: 100px;
+    height: 45px;
+    background: green;
+  }
+</style>
+<div id="multicol">
+  <div class="content"></div>
+  <div class="rel">
+    <div class="abs"></div>
+  </div>
+  <div class="content"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-006.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-006.html
new file mode 100644
index 00000000000..8138b429a40
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-006.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<link rel="help" href="href=https://www.w3.org/TR/css-position-3/#abspos-breaking">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<!-- Tests that the fragments of a positioned element are added to the right fragmentainer despite the presence of column spanners. -->
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<style>
+  #multicol {
+    column-count: 2;
+    column-fill: auto;
+    column-gap: 0px;
+    height: 140px;
+    width: 100px;
+    margin-top: -40px;
+  }
+  .rel {
+    position: relative;
+  }
+  .abs {
+    position: absolute;
+    width: 50px;
+    height: 200px;
+    background: green;
+  }
+  .spanner {
+    column-span: all;
+    height: 5px;
+  }
+ </style>
+ <div id="multicol">
+   <div class="rel">
+     <div class="spanner"></div>
+     <div style="height: 60px; "></div>
+     <div class="spanner"></div>
+     <div class="abs"></div>
+   </div>
+ </div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-007.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-007.html
new file mode 100644
index 00000000000..934f12c0cbe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-007.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<link rel="help" href="href=https://www.w3.org/TR/css-position-3/#abspos-breaking">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<!-- Tests that a positioned element without a top or bottom property uses the static position -
+     even though it's treated as an OOF element. -->
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<style>
+  #multicol {
+    column-count: 2;
+    column-fill: auto;
+    column-gap: 0px;
+    height: 100px;
+    width: 100px;
+    /* Move the multicolumn left to account for the first empty column */
+    position: relative;
+    left: -50px;
+  }
+  .rel {
+    position: relative;
+  }
+  .abs {
+    position: absolute;
+    width: 50px;
+    height: 200px;
+    background: green;
+  }
+</style>
+ <div id="multicol">
+   <div class="rel">
+     <div style="height: 100px; width: 50px;"></div>
+     <div class="abs"></div>
+   </div>
+ </div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-008.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-008.html
new file mode 100644
index 00000000000..3e665b3564c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-008.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<link rel="help" href="href=https://www.w3.org/TR/css-position-3/#abspos-breaking">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<!-- Tests fragmented abspos elements with a spanner nested inside. -->
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<style>
+  #multicol {
+    column-count: 2;
+    column-fill: auto;
+    column-gap: 0px;
+    height: 100px;
+    width: 100px;
+  }
+  .rel {
+    position: relative;
+  }
+  .abs {
+    position: absolute;
+    width: 50px;
+    height: 200px;
+    background: green;
+  }
+  .spanner {
+    column-span: all;
+    height: 10px;
+  }
+</style>
+<div id="multicol">
+  <div class="rel">
+    <div class="abs">
+      <div class="spanner"></div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-009.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-009.html
new file mode 100644
index 00000000000..ac278953b08
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-009.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<link rel="help" href="href=https://www.w3.org/TR/css-position-3/#abspos-breaking">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<!-- Tests that empty column fragments are added if an OOF element begins layout in a fragmentainer that is more than one index beyond the last existing column fragmentainer in the presence of a spanner. -->
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<style>
+  #multicol {
+    column-count: 2;
+    column-fill: auto;
+    column-gap: 0px;
+    height: 100px;
+    width: 100px;
+    margin-left: -100px;
+  }
+  .rel {
+    position: relative;
+  }
+  .abs {
+    position: absolute;
+    top: 200px;
+    width: 50px;
+    height: 200px;
+    background: green;
+  }
+</style>
+<div id="multicol">
+  <div class="rel">
+    <div class="abs"></div>
+  </div>
+  <div style="column-span: all;"></div>
+  <div style="column-span: all;"></div>
+  <div style="column-span: all;"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-010.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-010.html
new file mode 100644
index 00000000000..76f7f2d1e34
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-010.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<link rel="help" href="href=https://www.w3.org/TR/css-position-3/#abspos-breaking">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<!-- Fragmented OOF element with block-size percentage resolution. -->
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<style>
+  #multicol {
+    column-count: 3;
+    column-fill: auto;
+    column-gap: 0px;
+    /* last child is a spanner that takes up 33.33% so available height for
+       .rel and .abs is 100px */
+    height: 150px;
+    width: 150px;
+    margin-left: -50px;
+  }
+  .rel {
+    position: relative;
+  }
+  .abs {
+    position: absolute;
+    /* offset one full 100px column (accounted for by negative margin on #multicol */
+    top: 100px;
+    width: 50px;
+    height: 66.667%;
+    background: green;
+  }
+  .spanner {
+    column-span: all;
+    height: 33.33%;
+  }
+</style>
+<div id="multicol">
+  <div class="rel">
+    <div class="abs"></div>
+    <div style="width: 10px; height: 300px;"></div>
+  </div>
+  <div class="spanner"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-011.html b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-011.html
new file mode 100644
index 00000000000..8432c1afde9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-break/out-of-flow-in-multicolumn-011.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<link rel="help" href="href=https://www.w3.org/TR/css-position-3/#abspos-breaking">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<!-- Fragmented OOF element with block-size percentage resolution and overflow. -->
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<style>
+  #multicol {
+    /* Set things up so that the absolutely positioned element takes up two
+       columns of 50px each. Start in the second column so offset by negative
+       50px margin. */
+    columns: 5;
+    width: 250px;
+    height: 100px;
+    margin-left: -50px;
+    column-fill: auto;
+    column-gap: 0px;
+  }
+  .rel {
+    position: relative;
+  }
+  .abs {
+    position: absolute;
+    top: 0px;
+    width: 50px;
+    height: 100%;
+    background: green;
+  }
+</style>
+<div id="multicol">
+  <div style="height: 100px;"></div>
+  <div class="rel">
+    <div class="abs"></div>
+    <div style="width: 44px; height: 200px;">
+      <div style="width: 33px; height: 400px;"></div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-conditional/js/CSS-supports-CSSStyleDeclaration.html b/tests/wpt/web-platform-tests/css/css-conditional/js/CSS-supports-CSSStyleDeclaration.html
index 3a9786c510d..fd013b95e8a 100644
--- a/tests/wpt/web-platform-tests/css/css-conditional/js/CSS-supports-CSSStyleDeclaration.html
+++ b/tests/wpt/web-platform-tests/css/css-conditional/js/CSS-supports-CSSStyleDeclaration.html
@@ -612,7 +612,6 @@ const properties = [
   "shape-rendering",
   "size",
   "speak",
-  "speak-as",
   "src",
   "stop-color",
   "stop-opacity",
diff --git a/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-077.tentative.html b/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-077.tentative.html
new file mode 100644
index 00000000000..7cc9a335035
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/content-visibility/content-visibility-077.tentative.html
@@ -0,0 +1,27 @@
+<!doctype HTML>
+<meta charset="utf8">
+<title>CSS Content Visibility: content-visibility is not animatable.</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility">
+<meta name="assert" content="content-visibility is not animatable">
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<style>
+@keyframes cv {
+  from { content-visibility: auto }
+  to { content-visibility: hidden }
+}
+
+#container { animation: cv 1s; }
+</style>
+
+<div id=container></div>
+
+<script>
+test(() => {
+  const computedStyle = getComputedStyle(container);
+  assert_equals(computedStyle.contentVisibility, "visible");
+}, "Content-visibility is not animatable");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html b/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html
new file mode 100644
index 00000000000..b7c80ff0f67
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-properties-border-radius.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Images Module Level 3: image-orientation with background properties</title>
+<link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-images-3/#propdef-image-orientation">
+<link rel="match" href="reference/image-orientation-background-properties-border-radius-ref.html">
+<meta name=fuzzy content="10;100">
+<style>
+    div {
+        position: absolute;
+        width: 200px;
+        height: 200PX;
+        background-image: url(support/exif-orientation-5-lu.jpg);
+        background-repeat: no-repeat;
+        border-radius: 5px;
+    }
+
+    .repeat {
+        background-repeat: repeat;
+        top: 20px;
+        left: 20px;
+    }
+
+    .position {
+        background-position: bottom right;
+        top: 20px;
+        left: 240px;
+    }
+
+    .cover {
+        background-size: cover;
+        top: 240px;
+        left: 20px;
+    }
+
+    .contain {
+        background-size: contain;
+        top: 240px;
+        left: 240px;
+    }
+</style>
+</head>
+<body>
+    <div class="repeat">
+    </div>
+    <div class="position">
+    </div>
+    <div class="cover">
+    </div>
+    <div class="contain">
+    </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-properties.html b/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-properties.html
index 45651286b17..732233949e5 100644
--- a/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-properties.html
+++ b/tests/wpt/web-platform-tests/css/css-images/image-orientation/image-orientation-background-properties.html
@@ -12,7 +12,6 @@
         position: absolute;
         width: 200px;
         height: 200PX;
-        vertical-align: top;
         background-image: url(support/exif-orientation-5-lu.jpg);
         background-repeat: no-repeat;
     }
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-properties-border-radius-ref.html b/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-properties-border-radius-ref.html
new file mode 100644
index 00000000000..4a7e00c646f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-properties-border-radius-ref.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Images Module Level 3: image-orientation with background properties reference</title>
+<link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-images-3/#propdef-image-orientation">
+<style>
+    div {
+        position: absolute;
+        width: 200px;
+        height: 200PX;
+        background-image: url(../support/exif-orientation-5-lu-pre-rotated.jpg);
+        background-repeat: no-repeat;
+        border-radius: 5px;
+    }
+
+    .repeat {
+        background-repeat: repeat;
+        top: 20px;
+        left: 20px;
+    }
+
+    .position {
+        background-position: bottom right;
+        top: 20px;
+        left: 240px;
+    }
+
+    .cover {
+        background-size: cover;
+        top: 240px;
+        left: 20px;
+    }
+
+    .contain {
+        background-size: contain;
+        top: 240px;
+        left: 240px;
+    }
+</style>
+</head>
+<body>
+    <div class="repeat">
+    </div>
+    <div class="position">
+    </div>
+    <div class="cover">
+    </div>
+    <div class="contain">
+    </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-properties-ref.html b/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-properties-ref.html
index 0d2aabc4d00..be5edf420b6 100644
--- a/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-properties-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-images/image-orientation/reference/image-orientation-background-properties-ref.html
@@ -10,7 +10,6 @@
         position: absolute;
         width: 200px;
         height: 200PX;
-        vertical-align: top;
         background-image: url(../support/exif-orientation-5-lu-pre-rotated.jpg);
         background-repeat: no-repeat;
     }
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/hit-test-transformed-child.html b/tests/wpt/web-platform-tests/css/css-multicol/hit-test-transformed-child.html
new file mode 100644
index 00000000000..ac0fd54c9f3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/hit-test-transformed-child.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1146975">
+<style>
+  body {
+      margin: 8px;
+  }
+</style>
+<div style="columns:2; column-fill:auto; height:100px;">
+  <div>
+    <div id="target" style="transform:translateX(100px) translateY(200px); width:50px; height:50px; background:blue;"></div>
+  </div>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  test(()=> {
+      assert_equals(document.elementFromPoint(108, 208), target);
+      assert_equals(document.elementFromPoint(157, 208), target);
+      assert_equals(document.elementFromPoint(157, 257), target);
+  }, "inside");
+
+  test(()=> {
+      assert_not_equals(document.elementFromPoint(107, 208), target);
+      assert_not_equals(document.elementFromPoint(108, 207), target);
+      assert_not_equals(document.elementFromPoint(158, 257), target);
+      assert_not_equals(document.elementFromPoint(157, 258), target);
+      assert_not_equals(document.elementFromPoint(8, 8), target);
+  }, "outside");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-003.html b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-003.html
new file mode 100644
index 00000000000..06c1bea3abf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-margin-003.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/css-multicol-1/#column-span">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1052834">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<div style="columns:3; width:100px; background:green;">
+  <div>
+    <div style="column-span:all; height:10px; margin-bottom:50px;"></div>
+    <div style="column-span:all; height:10px; margin-top:80px;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-bottom.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-bottom.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-bottom.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-bottom.html
index ba23f0145cf..9cfae6d3ba9 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-bottom.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-bottom.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<script src="resources/sticky-util.js"></script>
+<script src="../resources/sticky-util.js"></script>
 
 <body></body>
 
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-change-top-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-change-top-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-change-top-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-change-top-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-change-top.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-change-top.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-change-top.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-change-top.html
index b15e7feb826..6a327ccd567 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-change-top.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-change-top.html
@@ -7,7 +7,7 @@
 <meta name="assert" content="This test checks that sticky elements are invalidated correctly when top/left/bottom/right change "/>
 
 <script src="/common/reftest-wait.js"></script>
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <!--
   It is important for this test that the sticky element is viewport-bound, and
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-child-multicolumn-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-child-multicolumn-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-child-multicolumn-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-child-multicolumn-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-child-multicolumn.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-child-multicolumn.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-child-multicolumn.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-child-multicolumn.html
index d12712eadd1..14bb695f1a4 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-child-multicolumn.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-child-multicolumn.html
@@ -5,7 +5,7 @@
 <link rel="author" title="Philip Rogers" href="mailto:pdr@chromium.org" />
 <meta name="assert" content="This test checks that a multicolumn element is positioned relative to a sticky position" />
 
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <style>
   body {
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-fixed-ancestor-iframe-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-iframe-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-fixed-ancestor-iframe-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-iframe-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-fixed-ancestor-iframe.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-iframe.html
similarity index 94%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-fixed-ancestor-iframe.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-iframe.html
index d442931663f..e50f5c829b6 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-fixed-ancestor-iframe.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-iframe.html
@@ -28,7 +28,7 @@
 </style>
 
 <div class="spacer"></div>
-<iframe src="resources/position-sticky-fixed-ancestor-iframe-child.html"></iframe>
+<iframe src="../resources/position-sticky-fixed-ancestor-iframe-child.html"></iframe>
 <div class="spacer"></div>
 
 <script>
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-fixed-ancestor-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-fixed-ancestor-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-fixed-ancestor.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-fixed-ancestor.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor.html
index 54c7ff303fe..52760992b11 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-fixed-ancestor.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-fixed-ancestor.html
@@ -7,7 +7,7 @@
 <meta name="assert" content="This test checks that a sticky element inside a fixed subtree doesn't scroll with the viewport "/>
 
 <script src="/common/reftest-wait.js"></script>
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-flexbox-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flexbox-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-flexbox-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flexbox-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-flexbox.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flexbox.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-flexbox.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flexbox.html
index 86b0d19fa96..fda06267bc1 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-flexbox.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-flexbox.html
@@ -4,7 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
 <meta name="assert" content="This test checks that position:sticky elements interoperate correctly with flexbox" />
 
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <style>
 .scroller {
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-get-bounding-client-rect.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-get-bounding-client-rect.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-get-bounding-client-rect.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-get-bounding-client-rect.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-grid-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-grid-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-grid-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-grid-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-grid.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-grid.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-grid.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-grid.html
index ef4f88a3c1f..0a0d39e4bd1 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-grid.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-grid.html
@@ -4,7 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
 <meta name="assert" content="This test checks that position:sticky elements interoperate correctly with grid" />
 
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <style>
 .scroller {
@@ -93,4 +93,3 @@ window.addEventListener('load', function() {
 </div>
 
 <p>You should see three green boxes of varying size above. There should be no red or blue.</p>
-
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-hyperlink-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-hyperlink-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-hyperlink-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-hyperlink-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-hyperlink.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-hyperlink.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-hyperlink.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-hyperlink.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-inflow-position.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-inflow-position.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-inflow-position.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-inflow-position.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-inline-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-inline-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-inline-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-inline-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-inline.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-inline.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-inline.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-inline.html
index 3c2becea4e9..7bad4b573e7 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-inline.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-inline.html
@@ -6,7 +6,7 @@
 
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <style>
 .group {
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-input-box-gets-focused-after-scroll.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-input-box-gets-focused-after-scroll.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-input-box-gets-focused-after-scroll.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-input-box-gets-focused-after-scroll.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-large-top-2-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-large-top-2-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-large-top-2-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-large-top-2-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-large-top-2.tentative.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-large-top-2.tentative.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-large-top-2.tentative.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-large-top-2.tentative.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-large-top-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-large-top-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-large-top-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-large-top-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-large-top.tentative.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-large-top.tentative.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-large-top.tentative.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-large-top.tentative.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-left.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-left.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-left.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-left.html
index 054cf10eabc..1fc2e8f88da 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-left.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-left.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<script src="resources/sticky-util.js"></script>
+<script src="../resources/sticky-util.js"></script>
 
 <body></body>
 
@@ -41,4 +41,3 @@ test(() => {
   assert_equals(elements.sticky.offsetLeft, maxOffsetInContainer);
 }, 'the sticky box should not be pushed outside its containing block');
 </script>
-
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-margins.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-margins.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-margins.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-margins.html
index b2d9944bb6d..7a9cf09faa6 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-margins.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-margins.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<script src="resources/sticky-util.js"></script>
+<script src="../resources/sticky-util.js"></script>
 
 <body></body>
 
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-bottom.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-bottom.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-bottom.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-bottom.html
index edea11fe132..b9b73cc486f 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-bottom.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-bottom.html
@@ -7,7 +7,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<script src="resources/sticky-util.js"></script>
+<script src="../resources/sticky-util.js"></script>
 
 <body></body>
 
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-inline-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-inline-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-inline-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-inline-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-inline.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-inline.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-inline.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-inline.html
index 07226f8730a..b646453c17a 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-inline.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-inline.html
@@ -6,7 +6,7 @@
 
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <style>
 .group {
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-left.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-left.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-left.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-left.html
index 755b69ac3c5..b92d45319b1 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-left.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-left.html
@@ -7,7 +7,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<script src="resources/sticky-util.js"></script>
+<script src="../resources/sticky-util.js"></script>
 
 <body></body>
 
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-right.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-right.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-right.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-right.html
index 9878aa774d8..f5314224b2b 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-right.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-right.html
@@ -7,7 +7,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<script src="resources/sticky-util.js"></script>
+<script src="../resources/sticky-util.js"></script>
 
 <body></body>
 
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-table-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-table-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-table-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-table-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-table.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-table.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-table.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-table.html
index 6632a49e11b..7a5fca415dc 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-table.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-table.html
@@ -4,7 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
 <meta name="assert" content="This test checks that nested position:sticky table elements render correctly" />
 
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <style>
 .group {
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-top.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-top.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-top.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-top.html
index 5332b46cd0c..90dc52dba8e 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-nested-top.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-nested-top.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<script src="resources/sticky-util.js"></script>
+<script src="../resources/sticky-util.js"></script>
 
 <body></body>
 
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-offset-overflow.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-offset-overflow.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-offset-overflow.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-offset-overflow.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-offset-top-left.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-offset-top-left.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-offset-top-left.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-offset-top-left.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-overflow-hidden.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-overflow-hidden.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-overflow-hidden.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-overflow-hidden.html
index b1dc49f34fe..622ca8fbef5 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-overflow-hidden.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-overflow-hidden.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<script src="resources/sticky-util.js"></script>
+<script src="../resources/sticky-util.js"></script>
 
 <body></body>
 
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-overflow-padding.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-overflow-padding.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-overflow-padding.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-overflow-padding.html
index fab6f2f731a..71b74e7886b 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-overflow-padding.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-overflow-padding.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<script src="resources/sticky-util.js"></script>
+<script src="../resources/sticky-util.js"></script>
 
 <body></body>
 
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-parsing.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-parsing.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-parsing.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-parsing.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-rendering-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-rendering-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-rendering-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-rendering-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-rendering.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-rendering.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-rendering.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-rendering.html
index d3408eb2468..506f9f97928 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-rendering.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-rendering.html
@@ -4,7 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
 <meta name="assert" content="This test checks that position:sticky elements are rendered correctly" />
 
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <style>
 .group {
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-right.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-right.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-right.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-right.html
index d280a1f3fdd..82d0e9af1db 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-right.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-right.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<script src="resources/sticky-util.js"></script>
+<script src="../resources/sticky-util.js"></script>
 
 <body></body>
 
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-root-scroller.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-root-scroller.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-root-scroller.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-root-scroller.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-scroll-reposition-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scroll-reposition-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-scroll-reposition-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scroll-reposition-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-scroll-reposition.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scroll-reposition.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-scroll-reposition.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scroll-reposition.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-scroll-with-clip-and-abspos-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scroll-with-clip-and-abspos-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-scroll-with-clip-and-abspos-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scroll-with-clip-and-abspos-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-scroll-with-clip-and-abspos.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scroll-with-clip-and-abspos.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-scroll-with-clip-and-abspos.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scroll-with-clip-and-abspos.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-scrolled-remove-sibling.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scrolled-remove-sibling.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-scrolled-remove-sibling.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-scrolled-remove-sibling.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-stacking-context-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-stacking-context-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-stacking-context-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-stacking-context-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-stacking-context.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-stacking-context.html
similarity index 95%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-stacking-context.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-stacking-context.html
index d047ba11522..c02d7ff7bce 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-stacking-context.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-stacking-context.html
@@ -4,7 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
 <meta name="assert" content="position:sticky elements should create a stacking context" />
 
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <style>
 .indicator {
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-parts-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-parts-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-parts-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-parts-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-parts.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-parts.html
similarity index 96%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-parts.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-parts.html
index 52a9be548b1..f034b99e8e5 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-parts.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-parts.html
@@ -4,7 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
 <meta name="assert" content="This test checks that nested position:sticky table elements render correctly" />
 
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <style>
 .scroller {
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-tfoot-bottom-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tfoot-bottom-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-tfoot-bottom-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tfoot-bottom-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-tfoot-bottom.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tfoot-bottom.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-tfoot-bottom.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tfoot-bottom.html
index 8947bc6ef2b..dfb4fd12a03 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-tfoot-bottom.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tfoot-bottom.html
@@ -4,7 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
 <meta name="assert" content="This test checks that the position:sticky bottom constraint behaves correctly for &lt;tfoot&gt; elements" />
 
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <style>
 table {
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-bottom-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-bottom-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-bottom-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-bottom-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-bottom.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-bottom.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-bottom.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-bottom.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-left-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-left-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-left-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-left-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-left.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-left.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-left.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-left.html
index aa834849655..c33d13548e3 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-left.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-left.html
@@ -4,7 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
 <meta name="assert" content="This test checks that the position:sticky left constraint behaves correctly for &lt;th&gt; elements" />
 
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <style>
 table {
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-right-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-right-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-right-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-right-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-right.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-right.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-right.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-right.html
index 8686301d801..e9c88c56b52 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-right.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-right.html
@@ -4,7 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
 <meta name="assert" content="This test checks that the position:sticky right constraint behaves correctly for &lt;th&gt; elements" />
 
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <style>
 table {
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-top-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-top-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-top-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-top-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-top.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-top.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-th-top.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-th-top.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-thead-top-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-thead-top-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-thead-top-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-thead-top-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-thead-top.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-thead-top.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-thead-top.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-thead-top.html
index 9c9cf061c99..e80fc12b63f 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-thead-top.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-thead-top.html
@@ -4,7 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
 <meta name="assert" content="This test checks that the position:sticky top constraint behaves correctly for &lt;thead&gt; elements" />
 
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <style>
 table {
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-tr-bottom-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-bottom-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-tr-bottom-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-bottom-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-tr-bottom.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-bottom.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-tr-bottom.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-bottom.html
index dbbaaf090eb..253ada5ae83 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-tr-bottom.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-bottom.html
@@ -4,7 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
 <meta name="assert" content="This test checks that the position:sticky bottom constraint behaves correctly for &lt;tr&gt; elements" />
 
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <style>
 table {
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-tr-top-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-top-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-tr-top-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-top-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-tr-top.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-top.html
similarity index 98%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-table-tr-top.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-top.html
index cd7fb8bff90..1d18f631c6b 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-table-tr-top.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-table-tr-top.html
@@ -4,7 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-position-3/#sticky-pos" />
 <meta name="assert" content="This test checks that the position:sticky top constraint behaves correctly for &lt;tr&gt; elements" />
 
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <style>
 table {
@@ -119,4 +119,3 @@ window.addEventListener('load', function() {
 </div>
 
 <div>You should see three green boxes above. No red or blue should be visible.</div>
-
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-top.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-top.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-top.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-top.html
index e4889d14802..9929fc734ba 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-top.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-top.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<script src="resources/sticky-util.js"></script>
+<script src="../resources/sticky-util.js"></script>
 
 <body></body>
 
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-transforms-translate.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-transforms-translate.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-transforms-translate.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-transforms-translate.html
index 791b035ef3c..fb2ca6b85f9 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-transforms-translate.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-transforms-translate.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<script src="resources/sticky-util.js"></script>
+<script src="../resources/sticky-util.js"></script>
 
 <body style="margin: 0;"></body>
 
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-transforms.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-transforms.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-transforms.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-transforms.html
index 9f18d587b57..080f05a4ebf 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-transforms.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-transforms.html
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 
-<script src="resources/sticky-util.js"></script>
+<script src="../resources/sticky-util.js"></script>
 
 <body style="margin: 0;"></body>
 
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-writing-modes-ref.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-writing-modes-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-writing-modes-ref.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-writing-modes-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-position/position-sticky-writing-modes.html b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-writing-modes.html
similarity index 97%
rename from tests/wpt/web-platform-tests/css/css-position/position-sticky-writing-modes.html
rename to tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-writing-modes.html
index 9e0856889d6..5deac8ca4aa 100644
--- a/tests/wpt/web-platform-tests/css/css-position/position-sticky-writing-modes.html
+++ b/tests/wpt/web-platform-tests/css/css-position/sticky/position-sticky-writing-modes.html
@@ -6,7 +6,7 @@
 
 <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 
-<script src="resources/ref-rectangle.js"></script>
+<script src="../resources/ref-rectangle.js"></script>
 
 <style>
 .group {
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-paint-image-notref.html b/tests/wpt/web-platform-tests/css/css-pseudo/selection-paint-image-notref.html
new file mode 100644
index 00000000000..ba1e97dffd8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/selection-paint-image-notref.html
@@ -0,0 +1,4 @@
+<!doctype html>
+<title>CSS Test Reference</title>
+<p>The red image to the right should shine through the green selection.</p>
+<div style="background:green;width:200px;height:100px"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/selection-paint-image.html b/tests/wpt/web-platform-tests/css/css-pseudo/selection-paint-image.html
new file mode 100644
index 00000000000..f5e2383ca81
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/selection-paint-image.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<title>CSS Pseudo-Elements Test: Replaced content shown through selection</title>
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#highlight-replaced">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css">
+<link rel="mismatch" href="selection-paint-image-notref.html">
+<style>
+  div { font: 100px/1 Ahem; }
+  img { vertical-align: top; }
+  ::selection { background-color: green; }
+</style>
+<p>The red image to the right should shine through the green selection.</p>
+<div>&nbsp;<img src="support/100x100-red.png"></div>
+<script>
+  let range = document.createRange();
+  range.selectNodeContents(document.querySelector("div"));
+  window.getSelection().addRange(range);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-001.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-001.html
index d2ed6cfb234..760635c40e8 100644
--- a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-001.html
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-001.html
@@ -7,5 +7,5 @@
 
 <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
-<div style="background: green; width: 100px; aspect-ratio: 0/1;"></div>
+<div style="background: red; width: 100px; aspect-ratio: 0/1;"></div>
 <div style="background: green; width: 100px; height: 100px;"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-002.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-002.html
index 28470dd8756..300e56d92cd 100644
--- a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-002.html
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-002.html
@@ -7,6 +7,6 @@
 
 <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
-<div style="width: 100px;">
+<div style="width: 100px; background: red;">
   <div style="background: green; height: 100px; aspect-ratio: 0/1;"></div>
 </div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-003.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-003.html
index ad0c3bf176b..5fb83a105ce 100644
--- a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-003.html
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-003.html
@@ -7,5 +7,5 @@
 
 <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
-<div style="background: green; width: 100px; aspect-ratio: 1/0;"></div>
+<div style="background: red; width: 100px; aspect-ratio: 1/0;"></div>
 <div style="background: green; width: 100px; height: 100px;"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-004.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-004.html
index 58db88c3bc1..a90837bad7b 100644
--- a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-004.html
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-004.html
@@ -7,6 +7,6 @@
 
 <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
-<div style="width: 100px;">
+<div style="width: 100px; background: red;">
   <div style="background: green; height: 100px; aspect-ratio: 1/0;"></div>
 </div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-005.html b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-005.html
index 2892028f940..d018184faaa 100644
--- a/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-005.html
+++ b/tests/wpt/web-platform-tests/css/css-sizing/aspect-ratio/zero-or-infinity-005.html
@@ -8,5 +8,5 @@
 <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
 
 <!-- "aspect-ratio: 0/0" behaves as "aspect-ratio: 1/0"-->
-<div style="background: green; width: 100px; aspect-ratio: 0/0;"></div>
+<div style="background: red; width: 100px; aspect-ratio: 0/0;"></div>
 <div style="background: green; width: 100px; height: 100px;"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-size-fallback-replaced.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-size-fallback-replaced.html
new file mode 100644
index 00000000000..aaac6482410
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-size-fallback-replaced.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html>
+  <meta charset="utf-8">
+  <title>CSS Sizing Test: Testing intrinsic size fallback 300x150 for some replaced elements.</title>
+  <link rel="author" title="Ting-Yu Lin" href="mailto:tlin@mozilla.com">
+  <link rel="author" title="Mozilla" href="https://www.mozilla.org/">
+  <link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic">
+  <meta name="assert" content="This test verifies that the intrinsic size fallback is 300px width and 150px height for replaced elements with no intrinsic size and no intrinsic ratio, regardless of the writing-mode.">
+
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/resources/check-layout-th.js"></script>
+
+  <style>
+  .test {
+    border: 0;
+    padding: 0;
+    background-color: blue;
+  }
+
+  .vertical {
+    writing-mode: vertical-rl;
+  }
+  </style>
+
+  <body onload="checkLayout('.test')">
+    <!-- horizontal writing-mode -->
+    <iframe class="test" data-expected-width="300" data-expected-height="150"></iframe>
+    <video class="test" data-expected-width="300" data-expected-height="150"></video>
+    <svg class="test" data-expected-width="300" data-expected-height="150"></svg>
+    <img src="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'></svg>"
+         class="test" data-expected-width="300" data-expected-height="150">
+
+    <!-- vertical writing-mode -->
+    <iframe class="test vertical" data-expected-width="300" data-expected-height="150"></iframe>
+    <video class="test vertical" data-expected-width="300" data-expected-height="150"></video>
+    <svg class="test vertical" data-expected-width="300" data-expected-height="150"></svg>
+    <img src="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'></svg>"
+         class="test vertical" data-expected-width="300" data-expected-height="150">
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/change-scale-wide-range-ref.html b/tests/wpt/web-platform-tests/css/css-transforms/change-scale-wide-range-ref.html
new file mode 100644
index 00000000000..264c6b6f25a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/change-scale-wide-range-ref.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<div style="width: 200px; height: 200px; background: green; border: 10px solid blue"></div>
+
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/change-scale-wide-range.html b/tests/wpt/web-platform-tests/css/css-transforms/change-scale-wide-range.html
new file mode 100644
index 00000000000..ec41946cfdd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/change-scale-wide-range.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>Change scale to very big then back</title>
+<link rel="author" title="Xianzhu Wang" href="mailto:wangxianzhu@chromium.org">
+<link rel="help" href="https://crbug.com/1146393">
+<link rel="match" href="change-scale-wide-range-ref.html">
+<style>
+#target {
+  will-change: transform;
+  transform-origin: 0 0;
+  width: 200px;
+  height: 200px;
+  background: green;
+  border: 10px solid blue;
+}
+</style>
+<div id="target"></div>
+<script>
+requestAnimationFrame(() => {
+  requestAnimationFrame(() => {
+    target.style.transform = 'scale(100)';
+    requestAnimationFrame(() => {
+      target.style.transform = 'scale(1)';
+      document.documentElement.removeAttribute('class');
+    });
+  });
+});
+</script>
+
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/huge-length-tiny-scale-ref.html b/tests/wpt/web-platform-tests/css/css-transforms/huge-length-tiny-scale-ref.html
new file mode 100644
index 00000000000..f3f8abc50e4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/huge-length-tiny-scale-ref.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<div style="width: 200px; height: 200px; background: green; border: 10px solid blue"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/huge-length-tiny-scale.html b/tests/wpt/web-platform-tests/css/css-transforms/huge-length-tiny-scale.html
new file mode 100644
index 00000000000..53f4f7d4478
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-transforms/huge-length-tiny-scale.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<title>Huge lengths with tiny scale</title>
+<link rel="author" title="Xianzhu Wang" href="mailto:wangxianzhu@chromium.org">
+<link rel="help" href="https://crbug.com/1132991">
+<link rel="match" href="huge-length-tiny-scale-ref.html">
+<style>
+body {
+  overflow: hidden;
+}
+div {
+  will-change: transform;
+  transform: scale(0.005);
+  transform-origin: 0 0;
+  width: 40000px;
+  height: 40000px;
+  background: green;
+  border: 2000px solid blue;
+}
+</style>
+<div></div>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-child-will-change-transform-ref.html b/tests/wpt/web-platform-tests/css/css-ui/resize-child-will-change-transform-ref.html
new file mode 100644
index 00000000000..36f39fc19bc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/resize-child-will-change-transform-ref.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<div style="width: 200px; height: 200px; overflow: hidden; resize: both; background: yellow">
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/resize-child-will-change-transform.html b/tests/wpt/web-platform-tests/css/css-ui/resize-child-will-change-transform.html
new file mode 100644
index 00000000000..b8adf53b04d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/resize-child-will-change-transform.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<title>CSS resize: child with will-change: transform</title>
+<link rel="help" href="http://www.w3.org/TR/css3-ui/#resize">
+<link rel="author" title="Xianzhu Wang" href="mailto:wangxianzhu@chromium.org">
+<link rel="match" href="resize-child-will-change-transform-ref.html">
+<div id="resize" style="width: 200px; height: 200px; overflow: auto; resize: both">
+  <div id="will-change" style="width: 100%; height: 100%; background: yellow; will-change: transform"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-float-in-relative.html b/tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-float-in-relative.html
new file mode 100644
index 00000000000..275fe29fb7c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom-view/elementFromPoint-float-in-relative.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-document-elementfrompoint" />
+<link rel="help" href="https://crbug.com/1146797">
+<link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+  <div>
+    <span style="position: relative">
+      <span>
+        <a id="target" href="#" style="float: left">link</a>
+      </span>
+    </span>
+  </div>
+<script>
+test(() => {
+  let target = document.getElementById('target');
+  let bounds = target.getBoundingClientRect();
+  let result = document.elementFromPoint(bounds.left + 1, bounds.top + 1);
+  assert_equals(result, target);
+});
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/docs/running-tests/from-web.md b/tests/wpt/web-platform-tests/docs/running-tests/from-web.md
index fae4c961743..464febbfc04 100644
--- a/tests/wpt/web-platform-tests/docs/running-tests/from-web.md
+++ b/tests/wpt/web-platform-tests/docs/running-tests/from-web.md
@@ -4,6 +4,12 @@ Tests that have been merged on GitHub are mirrored at [http://w3c-test.org/][w3c
 [On properly-configured systems](from-local-system), local files may also be
 served from the URL [http://web-platform.test](http://web-platform.test).
 
+Not all tests can be executed in-browser, as some tests rely on automation
+(e.g. via [testdriver.js](../writing-tests/testdriver)) that is not available
+when running a browser in a normal user session.
+
+## Web test runner
+
 For running multiple tests inside a browser, there is a test runner
 located at `/tools/runner/index.html`.
 
diff --git a/tests/wpt/web-platform-tests/dom/abort/addEventListenerAbortController.tentative.html b/tests/wpt/web-platform-tests/dom/abort/addEventListenerAbortController.tentative.html
new file mode 100644
index 00000000000..36373507c19
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/abort/addEventListenerAbortController.tentative.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Joey Arhar" href="mailto:jarhar@chromium.org">
+
+<!-- This behavior has not been specified yet. See https://github.com/whatwg/dom/issues/911 -->
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<body>
+
+<script>
+test(t => {
+  const target = new EventTarget();
+  const controller = new AbortController();
+
+  target.addEventListener('testevent', t.step_func(() => {
+    assert_unreached('testevent should have been canceled by AbortController');
+  }), {signal: controller.signal});
+
+  controller.abort();
+  target.dispatchEvent(new Event('testevent'));
+}, 'Tests support for EventController to cancel event listeners in addEventListener.');
+</script>
diff --git a/tests/wpt/web-platform-tests/editing/other/select-all-and-delete-in-html-element-having-contenteditable.html b/tests/wpt/web-platform-tests/editing/other/select-all-and-delete-in-html-element-having-contenteditable.html
index e8eb5e5e1ab..ab324c6d034 100644
--- a/tests/wpt/web-platform-tests/editing/other/select-all-and-delete-in-html-element-having-contenteditable.html
+++ b/tests/wpt/web-platform-tests/editing/other/select-all-and-delete-in-html-element-having-contenteditable.html
@@ -45,7 +45,7 @@ async function selectAllWithKey(elementToSelectAll) {
   } catch (ex) {
     throw ex;
   }
-  throw "Neither Control-A nor Meta-A does not select all contents";
+  throw "Neither Control-A nor Meta-A does select all contents";
 }
 
 function deleteWithBackspaceKey() {
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/common.js b/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/common.js
index c6bea817512..4266e394958 100644
--- a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/common.js
+++ b/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/common.js
@@ -71,7 +71,7 @@ setup(() => {
     if (window.reporting_observer_callback) {
       reports.forEach(window.reporting_observer_callback);
     }
-  }, {types: ["feature-policy-violation"]});
+  }, {types: ["permissions-policy-violation"]});
   window.reporting_observer_instance.observe();
   window.reporting_observer_callback = null;
 });
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/feature-policy-trust-token-redemption.html b/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/feature-policy-trust-token-redemption.html
index 6ae6f6fa4d4..fa5f38b62f7 100644
--- a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/feature-policy-trust-token-redemption.html
+++ b/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/feature-policy-trust-token-redemption.html
@@ -3,14 +3,14 @@
 
   window.onload = function() {
     // When the trust-token-redemption feature policy is enabled, redemption
-    // and signing ("send-srr") should both be available; when it's disabled,
+    // and signing ("send-redemption-record") should both be available; when it's disabled,
     // they should both be unavailable. Send the number of available operations
     // upstream in order to enforce this in assertions.
     let num_enabled = 4;
     try {
       new Request("https://issuer.example/", {
         trustToken: {
-          type: "srr-token-redemption"
+          type: "token-redemption"
         }
       });
     } catch (e) {
@@ -19,7 +19,7 @@
     try {
       new Request("https://destination.example/", {
         trustToken: {
-          type: "send-srr",
+          type: "send-redemption-record",
           issuers: ["https://issuer.example/"]
         }
       });
@@ -31,7 +31,7 @@
       const xhr = new XMLHttpRequest();
       xhr.open("GET", "https://issuer.example/");
       xhr.setTrustToken({
-        type: "srr-token-redemption"
+        type: "token-redemption"
       });
     } catch (e) {
       num_enabled--;
@@ -41,7 +41,7 @@
       const xhr = new XMLHttpRequest();
       xhr.open("GET", "https://destination.example/");
       xhr.setTrustToken({
-        type: "send-srr",
+        type: "send-redemption-record",
         issuers: ["https://issuer.example/"]
       });
     } catch (e) {
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/trust-token-redemption-default-feature-policy.tentative.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/experimental-features/trust-token-redemption-default-feature-policy.tentative.https.sub.html
index d88048953ea..134ccc084d6 100644
--- a/tests/wpt/web-platform-tests/feature-policy/experimental-features/trust-token-redemption-default-feature-policy.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/feature-policy/experimental-features/trust-token-redemption-default-feature-policy.tentative.https.sub.html
@@ -18,12 +18,12 @@
         // and XHR interfaces.
         new Request("https://issuer.example/", {
           trustToken: {
-            type: "srr-token-redemption"
+            type: "token-redemption"
           }
         });
         new Request("https://destination.example/", {
           trustToken: {
-            type: "send-srr", // signing
+            type: "send-redemption-record", // signing
             issuers: ["https://issuer.example/"]
           }
         });
@@ -31,13 +31,13 @@
         const redemption_xhr = new XMLHttpRequest();
         redemption_xhr.open("GET", "https://issuer.example/");
         redemption_xhr.setTrustToken({
-          type: "srr-token-redemption"
+          type: "token-redemption"
         });
 
         const signing_xhr = new XMLHttpRequest();
         signing_xhr.open("GET", "https://destination.example/");
         signing_xhr.setTrustToken({
-          type: "send-srr", // signing
+          type: "send-redemption-record", // signing
           issuers: ["https://issuer.example/"]
         });
       } catch (e) {
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html
index aede7e7876b..63cd9853dce 100644
--- a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html
@@ -30,7 +30,7 @@
     test_frame_policy('fullscreen', same_origin_src, undefined, true);
   }, 'Test frame policy on same origin iframe inherit from header policy.');
   test(function() {
-    test_frame_policy('fullscreen', cross_origin_src, undefined, true);
+    test_frame_policy('fullscreen', cross_origin_src, undefined, false);
   }, 'Test frame policy on cross origin iframe inherit from header policy.');
   test(function() {
     test_frame_policy('fullscreen', undefined, true, true);
@@ -42,9 +42,43 @@
     test_frame_policy('fullscreen', cross_origin_src, true, true);
   }, 'Test frame policy on srcdoc+ cross origin iframe inherit from header policy.');
   test(function() {
-    test_frame_policy('fullscreen', data_src, undefined, true);
+    test_frame_policy('fullscreen', data_src, undefined, false);
   }, 'Test frame policy on data: URL cross origin iframe inherit from header policy.');
 
+  // Test that frame policy can be used for sandboxed frames
+  test(function() {
+    test_frame_policy(
+      'fullscreen', same_origin_src, undefined, false, undefined, false, true);
+    }, 'Test frame policy on sandboxed iframe with no allow attribute.');
+  test(function() {
+    test_frame_policy(
+      'fullscreen', same_origin_src, undefined, true, 'fullscreen', false, true);
+    }, 'Test frame policy on sandboxed iframe with allow="fullscreen".');
+  test(function() {
+    test_frame_policy(
+      'fullscreen', same_origin_src, undefined, true, 'fullscreen \'src\'', false, true);
+    }, 'Test frame policy on sandboxed iframe with allow="fullscreen \'src\'".');
+  test(function() {
+    test_frame_policy(
+      'fullscreen', cross_origin_src, undefined, false, 'fullscreen ' + cross_origin, false, true);
+    }, 'Test frame policy on sandboxed iframe with allow="fullscreen ' + cross_origin + '".');
+  test(function() {
+    test_frame_policy(
+      'fullscreen', undefined, true, true, 'fullscreen', false, true);
+    }, 'Test frame policy on srcdoc sandboxed iframe with allow="fullscreen".');
+  test(function() {
+    test_frame_policy(
+      'fullscreen', same_origin_src, true, true, 'fullscreen', false, true);
+    }, 'Test frame policy on srcdoc + same origin sandboxed iframe with allow="fullscreen".');
+  test(function() {
+    test_frame_policy(
+      'fullscreen', cross_origin_src, true, true, 'fullscreen', false, true);
+    }, 'Test frame policy on srcdoc + cross origin sandboxed iframe with allow="fullscreen".');
+  test(function() {
+    test_frame_policy(
+      'fullscreen', data_src, undefined, false, 'fullscreen ' + cross_origin, false, true);
+    }, 'Test frame policy on sandboxed srcdoc iframe with allow="fullscreen ' + cross_origin + '".');
+
   // Test frame policy with allow attribute set to be one of the policies above.
   for (var i = 0; i < policies.length; i++) {
     test(function() {
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html
index b2b668256ff..9cf56ec7986 100644
--- a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-self.https.sub.html
@@ -16,10 +16,10 @@
   var cross_origin_src = cross_origin + same_origin_src;
   var data_src = 'data:text/html,<h1>data: URL</h1>';
   var policies = [
-    {allow: "*", sameOriginTestExpect: true, crossOriginTestExpect: true, dataOriginTestExpect: false},
+    {allow: "*", sameOriginTestExpect: true, crossOriginTestExpect: false, dataOriginTestExpect: false},
     {allow: "'self'", sameOriginTestExpect: true, crossOriginTestExpect: false, dataOriginTestExpect: false},
     {allow: "'none'", sameOriginTestExpect: false, crossOriginTestExpect: false, dataOriginTestExpect: false},
-    {allow: "'self' " + cross_origin + " https://www.example.com", sameOriginTestExpect: true, crossOriginTestExpect: true, dataOriginTestExpect: false}];
+    {allow: "'self' " + cross_origin + " https://www.example.com", sameOriginTestExpect: true, crossOriginTestExpect: false, dataOriginTestExpect: false}];
   var pipe_front = '?pipe=sub|header(Feature-Policy,fullscreen ';
   var pipe_end = ';)';
   var header_policies = ["*", "'self'", "'none'"];
@@ -45,18 +45,20 @@
     test_frame_policy('fullscreen', data_src, undefined, false);
   }, 'Test frame policy on data: URL cross origin iframe inherit from header policy.');
 
-  // Test that frame policy can be used for sandboxed frames
+  // Test that frame policy can be used for sandboxed frames. None of these
+  // frames should be allowed to use fullscreen, as the header prohibits any
+  // cross-origin use.`
   test(function() {
     test_frame_policy(
       'fullscreen', same_origin_src, undefined, false, undefined, false, true);
     }, 'Test frame policy on sandboxed iframe with no allow attribute.');
   test(function() {
     test_frame_policy(
-      'fullscreen', same_origin_src, undefined, true, 'fullscreen', false, true);
+      'fullscreen', same_origin_src, undefined, false, 'fullscreen', false, true);
     }, 'Test frame policy on sandboxed iframe with allow="fullscreen".');
   test(function() {
     test_frame_policy(
-      'fullscreen', same_origin_src, undefined, true, 'fullscreen \'src\'', false, true);
+      'fullscreen', same_origin_src, undefined, false, 'fullscreen \'src\'', false, true);
     }, 'Test frame policy on sandboxed iframe with allow="fullscreen \'src\'".');
   test(function() {
     test_frame_policy(
@@ -64,15 +66,15 @@
     }, 'Test frame policy on sandboxed iframe with allow="fullscreen ' + cross_origin + '".');
   test(function() {
     test_frame_policy(
-      'fullscreen', undefined, true, true, 'fullscreen', false, true);
+      'fullscreen', undefined, true, false, 'fullscreen', false, true);
     }, 'Test frame policy on srcdoc sandboxed iframe with allow="fullscreen".');
   test(function() {
     test_frame_policy(
-      'fullscreen', same_origin_src, true, true, 'fullscreen', false, true);
+      'fullscreen', same_origin_src, true, false, 'fullscreen', false, true);
     }, 'Test frame policy on srcdoc + same origin sandboxed iframe with allow="fullscreen".');
   test(function() {
     test_frame_policy(
-      'fullscreen', cross_origin_src, true, true, 'fullscreen', false, true);
+      'fullscreen', cross_origin_src, true, false, 'fullscreen', false, true);
     }, 'Test frame policy on srcdoc + cross origin sandboxed iframe with allow="fullscreen".');
   test(function() {
     test_frame_policy(
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some-override.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some-override.https.sub.html
index 17c9cc6b8db..744c9502480 100644
--- a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some-override.https.sub.html
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some-override.https.sub.html
@@ -19,7 +19,7 @@
   var data_src = 'data:text/html,<h1>data: URL</h1>';
   // Test feature policy with same_origin_src and cross_origin_src.
   var policies = [
-    {allow: "*", sameOriginTestExpect: true, crossOriginTestExpect: true, crossOrigin1TestExpect: true, dataOriginTestExpect: false},
+    {allow: "*", sameOriginTestExpect: true, crossOriginTestExpect: true, crossOrigin1TestExpect: false, dataOriginTestExpect: false},
     {allow: "'self'", sameOriginTestExpect: true, crossOriginTestExpect: false, crossOrigin1TestExpect: false, dataOriginTestExpect: false},
     {allow: "'none'", sameOriginTestExpect: false, crossOriginTestExpect: false, crossOrigin1TestExpect: false, dataOriginTestExpect: false},
     {allow: "'self' " + cross_origin + " https://www.example.com", sameOriginTestExpect: true, crossOriginTestExpect: true, crossOrigin1TestExpect: false, dataOriginTestExpect: false}];
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html
index d519743a438..5dfd8430d2f 100644
--- a/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-frame-policy-allowed-for-some.https.sub.html
@@ -19,7 +19,7 @@
   var data_src = 'data:text/html,<h1>data: URL</h1>';
   // Test feature policy with same_origin_src and cross_origin_src.
   var policies = [
-    {allow: "*", sameOriginTestExpect: true, crossOriginTestExpect: true, crossOrigin1TestExpect: true, dataOriginTestExpect: false},
+    {allow: "*", sameOriginTestExpect: true, crossOriginTestExpect: true, crossOrigin1TestExpect: false, dataOriginTestExpect: false},
     {allow: "'self'", sameOriginTestExpect: true, crossOriginTestExpect: false, crossOrigin1TestExpect: false, dataOriginTestExpect: false},
     {allow: "'none'", sameOriginTestExpect: false, crossOriginTestExpect: false, crossOrigin1TestExpect: false, dataOriginTestExpect: false},
     {allow: "'self' " + cross_origin + " https://www.example.com", sameOriginTestExpect: true, crossOriginTestExpect: true, crossOrigin1TestExpect: false, dataOriginTestExpect: false}];
@@ -33,7 +33,7 @@
     test_frame_policy('fullscreen', same_origin_src, undefined, true);
   }, 'Test frame policy on same origin iframe inherit from header policy.');
   test(function() {
-    test_frame_policy('fullscreen', cross_origin_src, undefined, true);
+    test_frame_policy('fullscreen', cross_origin_src, undefined, false);
   }, 'Test frame policy on cross origin iframe inherit from header policy.');
   test(function() {
     test_frame_policy('fullscreen', cross_origin_src1, undefined, false);
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html
index 6bf7ca65326..bfbdd6a20c9 100644
--- a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-all.https.sub.html
@@ -19,12 +19,15 @@
       ['*']);
   }, header_policy + ' -- test allowlist is ['*']');
 
-  // Test that fullscreen is allowed on all subframes.
+  // Test that fullscreen is allowed on same-origin subframes.
   test_allowed_feature_for_subframe(
     header_policy + ' -- test fullscreen is allowed on same-origin subframe',
     'fullscreen',
     same_origin_src);
-  test_allowed_feature_for_subframe(
+
+  // Test that fullscreen is not allowed on cross-origin subframes without an
+  // allow attribute.
+  test_disallowed_feature_for_subframe(
     header_policy + ' -- test fullscreen is allowed on cross-origin subframe',
     'fullscreen',
     cross_origin_src);
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-some.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-some.https.sub.html
index e07c51fefd9..d89ccef5c90 100644
--- a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-some.https.sub.html
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-allowed-for-some.https.sub.html
@@ -20,12 +20,13 @@
       [same_origin, cross_origin, 'https://www.example.com'].sort());
   }, header_policy + ' -- test allowlist is [same_origin, cross_origin, https://www.example.com]');
 
-  // Test that fullscreen is allowed on same_origin, some cross_origin subframes.
+  // Test that fullscreen is allowed on same-origin, but disallowed on cross-
+  // origin subframes, without an allow attribute.
   test_allowed_feature_for_subframe(
     header_policy + ' -- test fullscreen is allowed on same-origin subframe',
     'fullscreen',
     same_origin_src);
-  test_allowed_feature_for_subframe(
+  test_disallowed_feature_for_subframe(
     header_policy + ' -- test fullscreen is allowed on cross-origin ' + cross_origin_src + ' subframe',
     'fullscreen',
     cross_origin_src);
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-declined.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-declined.https.sub.html
index d00d592d9ac..ebe09ec9873 100644
--- a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-declined.https.sub.html
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-declined.https.sub.html
@@ -20,12 +20,12 @@
       [cross_origin, 'https://www.example.com'].sort());
   }, header_policy + ' -- test allowlist is [cross_origin, https://www.example.com]');
 
-  // Test that fullscreen is disallowed on same_origin, allowed on some cross_origin subframes.
+  // Test that fullscreen is disallowed everywhere.
   test_disallowed_feature_for_subframe(
     header_policy + ' -- test fullscreen is allowed on same-origin subframe',
     'fullscreen',
     same_origin_src);
-  test_allowed_feature_for_subframe(
+  test_disallowed_feature_for_subframe(
     header_policy + ' -- test fullscreen is allowed on cross-origin ' + cross_origin_src + ' subframe',
     'fullscreen',
     cross_origin_src);
@@ -35,7 +35,8 @@
     'fullscreen',
     cross_origin_src1);
 
-  // dynamically update sub frame's container policy
+  // dynamically update sub frame's container policy; fullscreen will still not
+  // be allowed.
   var disallow = "fullscreen 'none';"
   test_disallowed_feature_for_subframe(
     header_policy + ', iframe.allow = ' + disallow + ' -- test fullscreen is disallowed on same-origin subframe',
@@ -56,7 +57,7 @@
     same_origin_src,
     allow);
 
-  test_allowed_feature_for_subframe(
+  test_disallowed_feature_for_subframe(
     header_policy + 'iframe.allow = ' + allow + ' -- test fullscreen is allowed on specific cross-origin subframe',
     'fullscreen',
     cross_origin_src,
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-allowed-for-all.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-allowed-for-all.https.sub.html
index fb626605190..184cd013423 100644
--- a/tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-allowed-for-all.https.sub.html
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-allowed-for-all.https.sub.html
@@ -29,7 +29,7 @@
      ------------------------------------------ */
   test_subframe_header_policy('fullscreen', '*', same_origin_src,
       {local_all: true, local_self: true, local_none: false,
-      remote_all: true, remote_self: true, remote_none: false},
+      remote_all: false, remote_self: false, remote_none: false},
       'Test nested header policy with local iframe on policy "fullscreen *"');
   test_subframe_header_policy('fullscreen', '\'self\'', same_origin_src,
       {local_all: true, local_self: true, local_none: false,
@@ -50,11 +50,11 @@
      |  -------------------------------------  |
      ------------------------------------------- */
   test_subframe_header_policy('fullscreen', '*', cross_origin_src,
-      {local_all: true, local_self: true, local_none: false,
-      remote_all: true, remote_self: true, remote_none: false},
+      {local_all: false, local_self: false, local_none: false,
+      remote_all: false, remote_self: false, remote_none: false},
       'Test nested header policy with remote iframe on policy "fullscreen *"');
   test_subframe_header_policy('fullscreen', '\'self\'', cross_origin_src,
-      {local_all: true, local_self: true, local_none: false,
+      {local_all: false, local_self: false, local_none: false,
       remote_all: false, remote_self: false, remote_none: false},
       'Test nested header policy with remote iframe on policy "fullscreen \'self\'"');
   test_subframe_header_policy('fullscreen', '\'none\'', cross_origin_src,
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-allowed-for-self.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-allowed-for-self.https.sub.html
index 62ddd967495..fe857c916ce 100644
--- a/tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-allowed-for-self.https.sub.html
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-nested-header-policy-allowed-for-self.https.sub.html
@@ -27,7 +27,7 @@
      ------------------------------------------ */
   test_subframe_header_policy('fullscreen', '*', same_origin_src,
       {local_all: true, local_self: true, local_none: false,
-      remote_all: true, remote_self: true, remote_none: false},
+      remote_all: false, remote_self: false, remote_none: false},
       'Test nested header policy with local iframe on policy "fullscreen *"');
   test_subframe_header_policy('fullscreen', '\'self\'', same_origin_src,
       {local_all: true, local_self: true, local_none: false,
diff --git a/tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy.https.sub.html
index ccb6740d6a2..b69fa62c053 100644
--- a/tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy.https.sub.html
+++ b/tests/wpt/web-platform-tests/feature-policy/payment-allowed-by-feature-policy.https.sub.html
@@ -29,8 +29,13 @@
 
   async_test(t => {
     test_feature_availability('PaymentRequest()', t, cross_origin_src,
-        expect_feature_available_default);
-  }, header + ' allows cross-origin iframes.');
+        expect_feature_unavailable_default);
+  }, header + ' disallows cross-origin iframes.');
+
+  async_test(t => {
+    test_feature_availability('PaymentRequest()', t, cross_origin_src,
+        expect_feature_available_default, 'payment');
+  }, header + ' allow="payment" allows cross-origin iframes.');
 
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/camera-report-only.https.html b/tests/wpt/web-platform-tests/feature-policy/reporting/camera-report-only.https.html
deleted file mode 100644
index c22e1a51740..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/camera-report-only.https.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!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>
-    <script>
-var check_report_format = ([reports, observer]) => {
-  let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
-  assert_equals(report.body.featureId, "camera");
-  assert_equals(report.body.disposition, "report");
-};
-
-promise_test(async t => {
-  const report = new Promise(resolve => {
-    new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
-  });
-  await test_driver.bless('Activate document for user media');
-  await navigator.mediaDevices.getUserMedia({video: true});
-  check_report_format(await report);
-}, "Camera report only mode");
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/camera-report-only.https.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/camera-report-only.https.html.headers
deleted file mode 100644
index d7e19c072f7..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/camera-report-only.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy-Report-Only: camera 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/encrypted-media-report-only.https.html b/tests/wpt/web-platform-tests/feature-policy/reporting/encrypted-media-report-only.https.html
deleted file mode 100644
index 9ab4b0fe856..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/encrypted-media-report-only.https.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-  </head>
-  <body>
-    <script>
-var check_report_format = ([reports, observer]) => {
-  let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
-  assert_equals(report.body.featureId, "encrypted-media");
-  assert_equals(report.body.disposition, "report");
-};
-
-promise_test(async t => {
-  const report = new Promise(resolve => {
-    new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
-  });
-  await navigator.requestMediaKeySystemAccess("org.w3.clearkey",
-      [{
-        initDataTypes: ["webm"],
-        videoCapabilities: [{contentType: 'video/webm;codecs="vp8"'}],
-      }]);
-  check_report_format(await report);
-}, "Encrypted Media report only mode");
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/encrypted-media-report-only.https.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/encrypted-media-report-only.https.html.headers
deleted file mode 100644
index 37e625f31d1..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/encrypted-media-report-only.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy-Report-Only: encrypted-media 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/fullscreen-report-only.html b/tests/wpt/web-platform-tests/feature-policy/reporting/fullscreen-report-only.html
deleted file mode 100644
index 48fe9e3a69a..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/fullscreen-report-only.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!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>
-    <div id='fs'></div>
-    <script>
-var check_report_format = ([reports, observer]) => {
-  let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
-  assert_equals(report.body.featureId, "fullscreen");
-  assert_equals(report.body.disposition, "report");
-};
-
-promise_test(async t => {
-  const report = new Promise(resolve => {
-    new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
-  });
-  await test_driver.bless('Activate document for fullscreen');
-  await document.getElementById('fs').requestFullscreen();
-  check_report_format(await report);
-  document.exitFullscreen();
-}, "Fullscreen report only mode");
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/fullscreen-report-only.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/fullscreen-report-only.html.headers
deleted file mode 100644
index 1137afb1a68..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/fullscreen-report-only.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy-Report-Only: fullscreen 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/generic-sensor-report-only.https.html b/tests/wpt/web-platform-tests/feature-policy/reporting/generic-sensor-report-only.https.html
deleted file mode 100644
index 6c8c2efbf6c..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/generic-sensor-report-only.https.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-  </head>
-  <body>
-    <script>
-var sensor_features_verified = {
-  "accelerometer": false,
-  "ambient-light-sensor": false,
-  "magnetometer": false,
-  "gyroscope": false
-};
-
-var check_report_format = function(reports, observer) {
-  // Check each report in this batch. This observer callback may be called
-  // multiple times before all reports have been processed.
-  for (const report of reports) {
-
-    // Validate that the reported feature is one of the sensor features, and that
-    // we have not seen a report for this feature before.
-    assert_true(sensor_features_verified.hasOwnProperty(report.body.featureId));
-    assert_false(sensor_features_verified[report.body.featureId]);
-
-    // Validate the remainder of the report
-    assert_equals(report.type, "feature-policy-violation");
-    assert_equals(report.url, document.location.href);
-    assert_equals(report.body.sourceFile, document.location.href);
-    assert_equals(typeof report.body.lineNumber, "number");
-    assert_equals(typeof report.body.columnNumber, "number");
-    assert_equals(report.body.disposition, "report");
-
-    sensor_features_verified[report.body.featureId] = true;
-  }
-
-  // Test is only done when reports for all features have been seen
-  for (let result of Object.values(sensor_features_verified)) {
-    if (!result)
-      return;
-  }
-  this.done();
-};
-
-async_test(t => {
-  new ReportingObserver(t.step_func(check_report_format),
-                        {types: ['feature-policy-violation']}).observe();
-  new Accelerometer();
-  new AmbientLightSensor();
-  new Gyroscope();
-  new Magnetometer();
-}, "Generic Sensor report only mode");
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/generic-sensor-report-only.https.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/generic-sensor-report-only.https.html.headers
deleted file mode 100644
index 9d49d997f62..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/generic-sensor-report-only.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy-Report-Only: ambient-light-sensor 'none'; accelerometer 'none'; gyroscope 'none'; magnetometer 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/geolocation-report-only.https.html b/tests/wpt/web-platform-tests/feature-policy/reporting/geolocation-report-only.https.html
deleted file mode 100644
index 6c62b622cda..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/geolocation-report-only.https.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-  </head>
-  <body>
-    <script>
-var check_report_format = ([reports, observer]) => {
-  let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
-  assert_equals(report.body.featureId, "geolocation");
-  assert_equals(report.body.disposition, "report");
-};
-
-promise_test(async t => {
-  const report = new Promise(resolve => {
-    new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
-  });
-  try {
-    await new Promise((resolve, reject) => {
-      navigator.geolocation.getCurrentPosition(resolve, reject);
-    });
-    check_report_format(await report);
-  } catch (err) {
-    // In case the getCurrentPosition call was rejected due to user permissions,
-    // the report should be generated anyway. Wait for it and check the format
-    // before failing this test.
-    check_report_format(await report);
-    throw err;
-  }
-}, "Geolocation report only mode");
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/geolocation-report-only.https.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/geolocation-report-only.https.html.headers
deleted file mode 100644
index ba0662f577b..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/geolocation-report-only.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy-Report-Only: geolocation 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/microphone-report-only.https.html b/tests/wpt/web-platform-tests/feature-policy/reporting/microphone-report-only.https.html
deleted file mode 100644
index 539994cd70a..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/microphone-report-only.https.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!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>
-    <script>
-var check_report_format = ([reports, observer]) => {
-  let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
-  assert_equals(report.body.featureId, "microphone");
-  assert_equals(report.body.disposition, "report");
-};
-
-promise_test(async t => {
-  const report = new Promise(resolve => {
-    new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
-  });
-  await test_driver.bless('Activate document for user media');
-  await navigator.mediaDevices.getUserMedia({audio: true});
-  check_report_format(await report);
-}, "Microphone report only mode");
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/microphone-report-only.https.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/microphone-report-only.https.html.headers
deleted file mode 100644
index 5342e71dec8..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/microphone-report-only.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy-Report-Only: microphone 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/midi-report-only.https.html b/tests/wpt/web-platform-tests/feature-policy/reporting/midi-report-only.https.html
deleted file mode 100644
index bf0234d3f65..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/midi-report-only.https.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-  </head>
-  <body>
-    <script>
-var check_report_format = ([reports, observer]) => {
-  let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
-  assert_equals(report.body.featureId, "midi");
-  assert_equals(report.body.disposition, "report");
-};
-
-promise_test(async t => {
-  const report = new Promise(resolve => {
-    new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
-  });
-  try {
-    await navigator.requestMIDIAccess();
-    check_report_format(await report);
-  } catch (err) {
-    // In case the requestMIDIAccess call was rejected due to user permissions,
-    // the report should be generated anyway. Wait for it and check the format
-    // before failing this test.
-    check_report_format(await report);
-    throw err;
-  }
-}, "MIDI report only mode");
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/midi-report-only.https.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/midi-report-only.https.html.headers
deleted file mode 100644
index d307ccc9b09..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/midi-report-only.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy-Report-Only: midi 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/payment-report-only.https.html b/tests/wpt/web-platform-tests/feature-policy/reporting/payment-report-only.https.html
deleted file mode 100644
index d2b8e5ee9cc..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/payment-report-only.https.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-  </head>
-  <body>
-    <script>
-var check_report_format = ([reports, observer]) => {
-  let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
-  assert_equals(report.body.featureId, "payment");
-  assert_equals(report.body.disposition, "report");
-};
-
-promise_test(async t => {
-  const report = new Promise(resolve => {
-    new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
-  });
-  try {
-    const request = new PaymentRequest(
-      [{ supportedMethods: 'basic-card' }],
-      { total: { label: 'Total', amount: { currency: 'USD', value: 0 }}},
-      {});
-    await request.show()
-    check_report_format(await report);
-  } catch (err) {
-    // In case the show call was rejected, the report should be generated
-    // anyway. Wait for it and check the format before failing this test.
-    check_report_format(await report);
-    throw err;
-  }
-}, "PaymentRequest report only mode");
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/payment-report-only.https.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/payment-report-only.https.html.headers
deleted file mode 100644
index dc41987d022..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/payment-report-only.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy-Report-Only: payment 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/picture-in-picture-report-only.html b/tests/wpt/web-platform-tests/feature-policy/reporting/picture-in-picture-report-only.html
deleted file mode 100644
index 9e113a92429..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/picture-in-picture-report-only.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <script src='/common/media.js'></script>
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-    <script src="/resources/testdriver.js"></script>
-    <script src="/resources/testdriver-vendor.js"></script>
-    <script src='../resources/picture-in-picture.js'></script>
-  </head>
-  <body>
-    <script>
-const check_report_format = ([reports, observer]) => {
-  const report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
-  assert_equals(report.body.featureId, "picture-in-picture");
-  assert_equals(report.body.disposition, "report");
-};
-
-const loadVideo = () => new Promise(resolve => {
-    const video = document.createElement('video');
-    video.src = getVideoURI('/media/movie_5');
-    video.addEventListener('loadedmetadata', () => {
-      resolve(video);
-    }, { once: true });
-});
-
-promise_pip_test(async (t) => {
-  const report = new Promise(resolve => {
-    new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
-  });
-  const videoElement = await loadVideo();
-  await test_driver.bless('picture-in-picture');
-  await videoElement.requestPictureInPicture();
-  check_report_format(await report);
-}, "Picture-in-Picture report only mode");
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/picture-in-picture-report-only.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/picture-in-picture-report-only.html.headers
deleted file mode 100644
index b3ec5aaccf0..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/picture-in-picture-report-only.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy-Report-Only: picture-in-picture 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/screen-wake-lock-report-only.https.html b/tests/wpt/web-platform-tests/feature-policy/reporting/screen-wake-lock-report-only.https.html
deleted file mode 100644
index 51aa4f90c5f..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/screen-wake-lock-report-only.https.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!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>
-    <script>
-      promise_test(async (t) => {
-        const reportPromise = new Promise(resolve => {
-          new ReportingObserver((reports, observer) => resolve(reports),
-                                {types: ["feature-policy-violation"]}).observe();
-        });
-        await test_driver.set_permission({name: 'screen-wake-lock'},
-                                         'granted', false);
-        await navigator.wakeLock.request('screen');
-        const reports = await reportPromise;
-
-        assert_equals(reports.length, 1);
-        const report = reports[0];
-        assert_equals(report.type, "feature-policy-violation");
-        assert_equals(report.body.featureId, "screen-wake-lock");
-        assert_equals(report.body.sourceFile, document.location.href);
-        assert_equals(typeof report.body.lineNumber, "number");
-        assert_equals(typeof report.body.columnNumber, "number");
-        assert_equals(report.body.disposition, "report");
-      }, "Screen Wake Lock report only mode");
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/screen-wake-lock-report-only.https.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/screen-wake-lock-report-only.https.html.headers
deleted file mode 100644
index 3d729b50563..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/screen-wake-lock-report-only.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy-Report-Only: screen-wake-lock 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/serial-report-only.https.html b/tests/wpt/web-platform-tests/feature-policy/reporting/serial-report-only.https.html
deleted file mode 100644
index 11913a2ef77..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/serial-report-only.https.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!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>
-    <div id='fs'></div>
-    <script>
-var check_report_format = ([reports, observer]) => {
-  let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
-  assert_equals(report.body.featureId, "serial");
-  assert_equals(report.body.disposition, "report");
-};
-
-promise_test(async t => {
-  const report = new Promise(resolve => {
-    new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
-  });
-
-  await test_driver.bless('Activate document for serial.requestPort');
-  try {
-    await navigator.serial.requestPort({filters: []});
-    assert_unreached('requestPort() call should fail when no port is selected.');
-  } catch (e) {
-    assert_equals(e.code, DOMException.NOT_FOUND_ERR);
-  }
-  check_report_format(await report);
-}, "requestPort in serial report only mode");
-
-promise_test(async t => {
-  const report = new Promise(resolve => {
-    new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
-  });
-
-  await navigator.serial.getPorts();
-  check_report_format(await report);
-}, "getPorts in serial report only mode");
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/serial-report-only.https.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/serial-report-only.https.html.headers
deleted file mode 100644
index d408ccf6b15..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/serial-report-only.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy-Report-Only: serial 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/sync-xhr-report-only.html b/tests/wpt/web-platform-tests/feature-policy/reporting/sync-xhr-report-only.html
deleted file mode 100644
index 76d26ed5027..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/sync-xhr-report-only.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-  </head>
-  <body>
-    <script>
-const check_report_format = ([reports, observer]) => {
-  const report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
-  assert_equals(report.body.featureId, "sync-xhr");
-  assert_equals(report.body.disposition, "report");
-};
-
-promise_test(async t => {
-  const report = new Promise(resolve => {
-    new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
-  });
-  const xhr = new XMLHttpRequest();
-  xhr.open("GET", document.location.href, false);
-  xhr.send();
-  check_report_format(await report);
-}, "Sync-xhr report only mode");
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/sync-xhr-report-only.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/sync-xhr-report-only.html.headers
deleted file mode 100644
index 819dc7addcf..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/sync-xhr-report-only.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy-Report-Only: sync-xhr 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/usb-report-only.https.html b/tests/wpt/web-platform-tests/feature-policy/reporting/usb-report-only.https.html
deleted file mode 100644
index 7933e9eb5f6..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/usb-report-only.https.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!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>
-    <div id='fs'></div>
-    <script>
-var check_report_format = ([reports, observer]) => {
-  let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
-  assert_equals(report.body.featureId, "usb");
-  assert_equals(report.body.disposition, "report");
-};
-
-promise_test(async t => {
-  const report = new Promise(resolve => {
-    new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
-  });
-  await test_driver.bless('Activate document for USB');
-  await navigator.usb.getDevices();
-  check_report_format(await report);
-}, "USB report only mode");
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/usb-report-only.https.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/usb-report-only.https.html.headers
deleted file mode 100644
index 2705af70cee..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/usb-report-only.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy-Report-Only: usb 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/xr-report-only.https.html b/tests/wpt/web-platform-tests/feature-policy/reporting/xr-report-only.https.html
deleted file mode 100644
index 872db228495..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/xr-report-only.https.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <script src='/resources/testharness.js'></script>
-    <script src='/resources/testharnessreport.js'></script>
-  </head>
-  <body>
-    <script>
-const check_report_format = ([reports, observer]) => {
-  const report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
-  assert_equals(report.url, document.location.href);
-  assert_equals(report.body.featureId, "xr-spatial-tracking");
-  assert_equals(report.body.sourceFile, document.location.href);
-  assert_equals(typeof report.body.lineNumber, "number");
-  assert_equals(typeof report.body.columnNumber, "number");
-  assert_equals(report.body.disposition, "report");
-};
-
-promise_test(async t => {
-  const report = new Promise(resolve => {
-    new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
-  });
-  try {
-    let supported = await navigator.xr.isSessionSupported('immersive-vr');
-  } catch (err) {
-    // IsSessionSupported should only throw with a feature policy violation;
-    // however, inline does not trigger the feature policy,
-    // so immersive-vr must be used.
-    assert_unreached("isSessionSupported should not throw in ReportOnly mode");
-  }
-  check_report_format(await report);
-}, "XR report only mode");
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/feature-policy/reporting/xr-report-only.https.html.headers b/tests/wpt/web-platform-tests/feature-policy/reporting/xr-report-only.https.html.headers
deleted file mode 100644
index 45df4936e27..00000000000
--- a/tests/wpt/web-platform-tests/feature-policy/reporting/xr-report-only.https.html.headers
+++ /dev/null
@@ -1 +0,0 @@
-Feature-Policy-Report-Only: xr-spatial-tracking 'none'
diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/featurepolicy.js b/tests/wpt/web-platform-tests/feature-policy/resources/featurepolicy.js
index 347cba1deea..864c434c663 100644
--- a/tests/wpt/web-platform-tests/feature-policy/resources/featurepolicy.js
+++ b/tests/wpt/web-platform-tests/feature-policy/resources/featurepolicy.js
@@ -449,6 +449,6 @@ function expect_reports(report_count, policy_name, description) {
         if (num_received_reports >= report_count) {
             t.done();
         }
-   }), {types: ['feature-policy-violation'], buffered: true}).observe();
+   }), {types: ['permissions-policy-violation'], buffered: true}).observe();
   }, description);
 }
diff --git a/tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-about-blank-checker.html b/tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-about-blank-checker.html
new file mode 100644
index 00000000000..7a8b6132375
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/connection-pool/resources/network-partition-about-blank-checker.html
@@ -0,0 +1,35 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>about:blank Network Partition Checker</title>
+  <meta name="help" href="https://fetch.spec.whatwg.org/#network-partition-keys">
+  <meta name="timeout" content="normal">
+</head>
+<body>
+<script>
+  async function fetch_and_reply() {
+    // Load about:blank in a new tab, and inject the network partition checking code into it.
+    var win;
+    try {
+      win = window.open();
+      var url = 'SUBRESOURCE_PREFIX:&dispatch=fetch_file&path=fetch/connection-pool/resources/network-partition-checker.html&sandbox=true';
+      var response = await fetch(url, {credentials: 'omit', mode: 'cors'});
+      win.document.write(await response.text());
+    } catch (e) {
+      win.close();
+      window.parent.postMessage({result: 'error', details: e.message}, '*');
+      return;
+    }
+
+    // Listen for first message from the new window and pass it back to the parent.
+    function message_listener(event) {
+      window.parent.postMessage(event.data, '*');
+      win.close();
+    }
+    window.addEventListener('message', message_listener, {once: true});
+  }
+  fetch_and_reply();
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-outer-contenwindow.html b/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-outer-contenwindow.html
deleted file mode 100644
index bafc26065c8..00000000000
--- a/tests/wpt/web-platform-tests/focus/support/activeelement-after-immediately-focusing-same-site-iframe-outer-contenwindow.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<title>activeElement when focusing same-site iframe's contentWindow</title>
-<script>
-let log = "";
-function getLog() {
-    return log;
-}
-window.onmessage = function(e) {
-    log += e.data;
-};
-</script>
-<iframe src="activeelement-after-immediately-focusing-same-site-iframe-inner-contentwindow.html"></iframe>
-<script>
-log += "outerparse,";
-log += "activeElement:" + document.activeElement.tagName + ",";
-log += "willfocusiframe,";
-document.getElementsByTagName("iframe")[0].focus();
-log += "didfocusiframe,";
-log += "activeElement:" + document.activeElement.tagName + ",";
-log += "willbluriframe,";
-document.getElementsByTagName("iframe")[0].blur();
-log += "didbluriframe,";
-log += "activeElement:" + document.activeElement.tagName + ",";
-log += "willspineventloop,"
-opener.step_timeout(function() {
-    opener.postMessage(getLog(), "*");
-}, 1500);
-</script>
diff --git a/tests/wpt/web-platform-tests/gamepad/feature-policy-gamepad.html b/tests/wpt/web-platform-tests/gamepad/feature-policy-gamepad.html
index 8ee0c719216..2747a04b34f 100644
--- a/tests/wpt/web-platform-tests/gamepad/feature-policy-gamepad.html
+++ b/tests/wpt/web-platform-tests/gamepad/feature-policy-gamepad.html
@@ -1,9 +1,8 @@
 <script>
-    try {
-        let test = navigator.getGamepads();
-        if (test)
-            window.parent.postMessage({ enabled:true}, '*');
-    } catch (err) {
-        window.parent.postMessage({ enabled:false}, '*');
-    }
-</script>
\ No newline at end of file
+  try {
+    const test = navigator.getGamepads();
+    if (test) window.parent.postMessage({ enabled: true }, "*");
+  } catch (err) {
+    window.parent.postMessage({ enabled: false }, "*");
+  }
+</script>
diff --git a/tests/wpt/web-platform-tests/gamepad/gamepad-default-feature-policy.https.sub.html b/tests/wpt/web-platform-tests/gamepad/gamepad-default-feature-policy.https.sub.html
index fce0eaffee3..347f40b2a4e 100644
--- a/tests/wpt/web-platform-tests/gamepad/gamepad-default-feature-policy.https.sub.html
+++ b/tests/wpt/web-platform-tests/gamepad/gamepad-default-feature-policy.https.sub.html
@@ -5,30 +5,40 @@
   <script src=/feature-policy/resources/featurepolicy.js></script>
   <script src=util/utils.js></script>
   <script>
-  'use strict';
-  const relative_path = '/gamepad/feature-policy-gamepad.html';
-  const base_src = '/feature-policy/resources/redirect-on-load.html#';
-  const sub = 'https://{{domains[www]}}:{{ports[https][0]}}';
+  "use strict";
+  const relative_path = "/gamepad/feature-policy-gamepad.html";
+  const base_src = "/feature-policy/resources/redirect-on-load.html#";
+  const sub = "https://{{domains[www]}}:{{ports[https][0]}}";
   const same_origin_src = base_src + relative_path;
   const cross_origin_src = sub + relative_path;
   const header = 'Feature-Policy allow="gamepad"';
 
-  async_test(t => {
+  async_test((t) => {
     test_feature_availability(
-        'getGamepads()', t, same_origin_src,
-        expect_feature_available_default);
-  }, header + ' allows same-origin by default.');
+      "getGamepads()",
+      t,
+      same_origin_src,
+      expect_feature_available_default
+    );
+  }, header + " allows same-origin by default.");
 
-  async_test(t => {
+  async_test((t) => {
     test_feature_availability(
-        'getGamepads()', t, cross_origin_src,
-        expect_feature_available_default, 'gamepad');
-  }, header + ' allows cross-origin with feature allowed.');
+      "getGamepads()",
+      t,
+      cross_origin_src,
+      expect_feature_available_default,
+      "gamepad"
+    );
+  }, header + " allows cross-origin with feature allowed.");
 
-  async_test(t => {
+  async_test((t) => {
     test_feature_availability(
-        'getGamepads()', t, cross_origin_src,
-        expect_feature_unavailable_default);
-  }, header + ' disallows cross-origin by default.');
+      "getGamepads()",
+      t,
+      cross_origin_src,
+      expect_feature_unavailable_default
+    );
+  }, header + " disallows cross-origin by default.");
   </script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/gamepad/gamepad-secure-context.html b/tests/wpt/web-platform-tests/gamepad/gamepad-secure-context.html
index 97b4ea2967e..034595ebdb6 100644
--- a/tests/wpt/web-platform-tests/gamepad/gamepad-secure-context.html
+++ b/tests/wpt/web-platform-tests/gamepad/gamepad-secure-context.html
@@ -4,17 +4,8 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
-  promise_test(() => {
-    return new Promise((resolve, reject) => {
-      try {
-        navigator.getGamepads();
-        reject(
-          "getGamepads should throw an error when being called in non-secure contexts."
-        );
-      } catch (error) {
-        resolve();
-      }
-    });
-  }, "When in a non-secure context, getGamepad() should throw an error.");
-
+  test(() => {
+    assert_false("getGamepads" in Navigator.prototype, "not in prototype");
+    assert_false("getGamepads" in navigator, "not on instance");
+  }, "Gamepad API is not exposed in insecure contexts");
 </script>
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.html
index 8b01fbbc8c4..1f1a23eed93 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.html
@@ -26,6 +26,7 @@ f.load();
 fonts.add(f);
 fonts.ready.then(function() {
     ctx.font = '50px CanvasTest';
+    ctx.direction = 'ltr';
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.worker.js
index c84308c7f07..b3705520b16 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.ltr.worker.js
@@ -22,6 +22,7 @@ f.load();
 fonts.add(f);
 fonts.ready.then(function() {
     ctx.font = '50px CanvasTest';
+    ctx.direction = 'ltr';
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.html
index 0cf7b5756ae..f18e4974ba1 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.html
@@ -26,6 +26,7 @@ f.load();
 fonts.add(f);
 fonts.ready.then(function() {
     ctx.font = '50px CanvasTest';
+    ctx.direction = 'rtl';
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.worker.js
index 6845dd474d6..a0561c1f806 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.end.rtl.worker.js
@@ -22,6 +22,7 @@ f.load();
 fonts.add(f);
 fonts.ready.then(function() {
     ctx.font = '50px CanvasTest';
+    ctx.direction = 'rtl';
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.html
index 301b6dc4522..08c222b9a59 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.html
@@ -26,6 +26,7 @@ f.load();
 fonts.add(f);
 fonts.ready.then(function() {
     ctx.font = '50px CanvasTest';
+    ctx.direction = 'ltr';
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.worker.js
index 4e7db42542b..1cefdd0cfa6 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.ltr.worker.js
@@ -22,6 +22,7 @@ f.load();
 fonts.add(f);
 fonts.ready.then(function() {
     ctx.font = '50px CanvasTest';
+    ctx.direction = 'ltr';
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.html b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.html
index 27723f23efc..3d9670abc30 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.html
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.html
@@ -26,6 +26,7 @@ f.load();
 fonts.add(f);
 fonts.ready.then(function() {
     ctx.font = '50px CanvasTest';
+    ctx.direction = 'rtl';
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
diff --git a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.worker.js b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.worker.js
index 545c1d9c27d..2cc818fc928 100644
--- a/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.worker.js
+++ b/tests/wpt/web-platform-tests/html/canvas/offscreen/text/2d.text.draw.align.start.rtl.worker.js
@@ -22,6 +22,7 @@ f.load();
 fonts.add(f);
 fonts.ready.then(function() {
     ctx.font = '50px CanvasTest';
+    ctx.direction = 'rtl';
     ctx.fillStyle = '#f00';
     ctx.fillRect(0, 0, 100, 50);
     ctx.fillStyle = '#0f0';
diff --git a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/text.yaml b/tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/text.yaml
index 30a0ad1a6fe..b218d2d8b8b 100644
--- a/tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/text.yaml
+++ b/tests/wpt/web-platform-tests/html/canvas/tools/yaml/offscreen/text.yaml
@@ -769,7 +769,6 @@
   - 2d.text.align.left
   fonts:
   - CanvasTest
-  canvas: width="100" height="50" dir="ltr"
   code: |
     var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')");
     let fonts = (self.fonts ? self.fonts : document.fonts);
@@ -777,6 +776,7 @@
     fonts.add(f);
     fonts.ready.then(function() {
         ctx.font = '50px CanvasTest';
+        ctx.direction = 'ltr';
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -798,7 +798,6 @@
   - 2d.text.draw.direction
   fonts:
   - CanvasTest
-  canvas: width="100" height="50" dir="rtl"
   code: |
     var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')");
     let fonts = (self.fonts ? self.fonts : document.fonts);
@@ -806,6 +805,7 @@
     fonts.add(f);
     fonts.ready.then(function() {
         ctx.font = '50px CanvasTest';
+        ctx.direction = 'rtl';
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -826,7 +826,6 @@
   - 2d.text.align.right
   fonts:
   - CanvasTest
-  canvas: width="100" height="50" dir="ltr"
   code: |
     var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')");
     let fonts = (self.fonts ? self.fonts : document.fonts);
@@ -834,6 +833,7 @@
     fonts.add(f);
     fonts.ready.then(function() {
         ctx.font = '50px CanvasTest';
+        ctx.direction = 'ltr';
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
@@ -855,7 +855,6 @@
   - 2d.text.draw.direction
   fonts:
   - CanvasTest
-  canvas: width="100" height="50" dir="rtl"
   code: |
     var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')");
     let fonts = (self.fonts ? self.fonts : document.fonts);
@@ -863,6 +862,7 @@
     fonts.add(f);
     fonts.ready.then(function() {
         ctx.font = '50px CanvasTest';
+        ctx.direction = 'rtl';
         ctx.fillStyle = '#f00';
         ctx.fillRect(0, 0, 100, 50);
         ctx.fillStyle = '#0f0';
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission.https.html
index 2fc545d5acb..31c0a913338 100644
--- a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission.https.html
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/cross-origin-isolated-permission.https.html
@@ -158,7 +158,7 @@ generateFrameTest(ORIGIN, 'self', true);
 // We need the backslash to escape the close parenthesis in a wpt pipe.
 generateFrameTest(ORIGIN, '(\\)', false);
 generateFrameTest(HTTPS_REMOTE_ORIGIN, undefined, false);
-generateFrameTest(HTTPS_REMOTE_ORIGIN, '*', true);
+generateFrameTest(HTTPS_REMOTE_ORIGIN, '*', false);
 generateFrameTest(HTTPS_REMOTE_ORIGIN, 'self', false);
 // We need the backslash to escape the close parenthesis in a  wpt pipe.
 generateFrameTest(HTTPS_REMOTE_ORIGIN, '(\\)', false);
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/dialog.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/dialog.html
index f8e28ceb646..3588e036708 100644
--- a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/dialog.html
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/flow-content-0/dialog.html
@@ -24,10 +24,9 @@ setup(() => {
   window.refWhite = refStyle.backgroundColor;
   window.refBlack = refStyle.color;
   window.refMediumBorder = refStyle.borderTopWidth;
-  const iframeHeight = 150;
+  window.iframeHeight = 150;
   const bodyTopMargin = 8;
   window.dialogSize = parseFloat(ref1em) * 2 + parseFloat(refMediumBorder) * 2;
-  window.centeredVerticalDistance = iframeHeight / 2 - dialogSize / 2;
   window.normalBottomDistance = iframeHeight - bodyTopMargin - dialogSize;
 }, {explicit_done: true});
 
@@ -37,15 +36,20 @@ onload = () => {
     const styleAttr = iframe.getAttribute('style');
     const iframeWidth = parseInt(styleAttr.split(' ')[1]);
     const horizontalDistance = iframeWidth / 2 - dialogSize / 2;
+    const verticalDistance = iframeHeight / 2 - dialogSize / 2;
     test(() => {
       const style = win.getComputedStyle(win.dialogClosed);
+      assert_equals(style.position, 'absolute', 'position');
       assert_equals(style.display, 'none', 'display');
+      assert_equals(style.overflow, 'visible', 'overflow');
       assert_equals(style.top, 'auto', 'top');
       assert_equals(style.right, '0px', 'right');
       assert_equals(style.bottom, 'auto', 'bottom');
       assert_equals(style.left, '0px', 'left');
       assert_equals(style.width, 'fit-content', 'width');
       assert_equals(style.height, 'fit-content', 'height');
+      assert_equals(style.maxWidth, 'none', 'max-width');
+      assert_equals(style.maxHeight, 'none', 'max-height');
       assert_equals(style.marginTop, 'auto', 'marginTop');
       assert_equals(style.marginRight, 'auto', 'marginRight');
       assert_equals(style.marginBottom, 'auto', 'marginBottom');
@@ -55,13 +59,17 @@ onload = () => {
 
     test(() => {
       const style = win.getComputedStyle(win.dialogOpen);
+      assert_equals(style.position, 'absolute', 'position');
       assert_equals(style.display, 'block', 'display');
+      assert_equals(style.overflow, 'visible', 'overflow');
       assert_equals(style.top, '8px', 'top');
       assert_equals(style.right, '0px', 'right');
       assert_equals(style.bottom, normalBottomDistance + 'px', 'bottom');
       assert_equals(style.left, '0px', 'left');
       assert_equals(style.width, '0px', 'width');
       assert_equals(style.height, '0px', 'height');
+      assert_equals(style.maxWidth, 'none', 'max-width');
+      assert_equals(style.maxHeight, 'none', 'max-height');
       assert_equals(style.marginTop, '0px', 'marginTop');
       assert_equals(style.marginRight, horizontalDistance + 'px', 'marginRight');
       assert_equals(style.marginBottom, '0px', 'marginBottom');
@@ -71,16 +79,20 @@ onload = () => {
 
     test(() => {
       const style = win.getComputedStyle(win.dialogModal);
+      assert_equals(style.position, 'fixed', 'position');
       assert_equals(style.display, 'block', 'display');
-      assert_equals(style.top, centeredVerticalDistance + 'px', 'top');
+      assert_equals(style.overflow, 'auto', 'overflow');
+      assert_equals(style.top, '0px', 'top');
       assert_equals(style.right, '0px', 'right');
-      assert_equals(style.bottom, centeredVerticalDistance + 'px', 'bottom');
+      assert_equals(style.bottom, '0px', 'bottom');
       assert_equals(style.left, '0px', 'left');
       assert_equals(style.width, '0px', 'width');
       assert_equals(style.height, '0px', 'height');
-      assert_equals(style.marginTop, '0px', 'marginTop');
+      assert_equals(style.maxWidth, 'calc(100% - 38px)', 'max-width');
+      assert_equals(style.maxHeight, 'calc(100% - 38px)', 'max-height');
+      assert_equals(style.marginTop, verticalDistance + 'px', 'marginTop');
       assert_equals(style.marginRight, horizontalDistance + 'px', 'marginRight');
-      assert_equals(style.marginBottom, '0px', 'marginBottom');
+      assert_equals(style.marginBottom, verticalDistance + 'px', 'marginBottom');
       assert_equals(style.marginLeft, horizontalDistance + 'px', 'marginLeft');
       assertCommon(style);
     }, `Modal dialog in ${styleAttr} iframe`);
@@ -89,7 +101,6 @@ onload = () => {
 };
 
 function assertCommon(style) {
-  assert_equals(style.position, 'absolute', 'position');
   assert_equals(style.borderTopStyle, 'solid', 'borderTopStyle');
   assert_equals(style.borderRightStyle, 'solid', 'borderRightStyle');
   assert_equals(style.borderBottomStyle, 'solid', 'borderBottomStyle');
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content-crash.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content-crash.html
new file mode 100644
index 00000000000..a6e8fa7a826
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/sticky-content-crash.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<link rel="help" href="http://crbug.com/1146872">
+<body>
+<fieldset><span><span></span></span></fieldset>
+<div id="host"><span></span></div>
+<script>
+const host = document.querySelector('#host');
+const shadowRoot = host.attachShadow({mode: 'closed'});
+const fieldset = shadowRoot.appendChild(document.createElement('fieldset'));
+fieldset.setAttribute('style', 'overflow: scroll');
+fieldset.innerHTML = '<slot></slot>';
+</script>
+<style>
+*:not(fieldset, div) {
+  position: sticky;
+  bottom: 72pc;
+}
+fieldset {
+  overflow: visible scroll;
+}
+</style>
+</body>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-abssize.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-abssize.html
new file mode 100644
index 00000000000..ba55da86865
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-abssize.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/rendering.html#frames-and-framesets">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1116832">
+<link rel="match" href="reference/green-ref.html">
+<frameset cols="4294967227%,*" frameborder="0">
+  <frame src="resources/green.html">
+  <frame src="resources/red.html">
+</frameset>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-percentage.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-percentage.html
new file mode 100644
index 00000000000..ba55da86865
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-percentage.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/rendering.html#frames-and-framesets">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1116832">
+<link rel="match" href="reference/green-ref.html">
+<frameset cols="4294967227%,*" frameborder="0">
+  <frame src="resources/green.html">
+  <frame src="resources/red.html">
+</frameset>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-relsize.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-relsize.html
new file mode 100644
index 00000000000..1bfb2b5404d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-cols-relsize.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/rendering.html#frames-and-framesets">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1116832">
+<link rel="match" href="reference/green-ref.html">
+<frameset cols="4294967227*,*" frameborder="0">
+  <frame src="resources/green.html">
+  <frame src="resources/red.html">
+</frameset>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-abssize.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-abssize.html
new file mode 100644
index 00000000000..7cd86b94554
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-abssize.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/rendering.html#frames-and-framesets">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1116832">
+<link rel="match" href="reference/green-ref.html">
+<frameset rows="4294967227%,*" frameborder="0">
+  <frame src="resources/green.html">
+  <frame src="resources/red.html">
+</frameset>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-percentage.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-percentage.html
new file mode 100644
index 00000000000..7cd86b94554
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-percentage.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/rendering.html#frames-and-framesets">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1116832">
+<link rel="match" href="reference/green-ref.html">
+<frameset rows="4294967227%,*" frameborder="0">
+  <frame src="resources/green.html">
+  <frame src="resources/red.html">
+</frameset>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-relsize.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-relsize.html
new file mode 100644
index 00000000000..7fd29f6a9e7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/large-rows-relsize.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/rendering.html#frames-and-framesets">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1116832">
+<link rel="match" href="reference/green-ref.html">
+<frameset rows="4294967227*,*" frameborder="0">
+  <frame src="resources/green.html">
+  <frame src="resources/red.html">
+</frameset>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/green-ref.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/green-ref.html
new file mode 100644
index 00000000000..62208d72c91
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/reference/green-ref.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  body { background: green; }
+</style>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/resources/green.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/resources/green.html
new file mode 100644
index 00000000000..62208d72c91
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/resources/green.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  body { background: green; }
+</style>
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/resources/red.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/resources/red.html
new file mode 100644
index 00000000000..b5e7f79617d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-frameset-and-frame-elements/resources/red.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<style>
+  body { background: red; }
+</style>
diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html
index 00665f66cec..e5453d73ee8 100644
--- a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html
+++ b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/abspos-dialog-layout.html
@@ -15,8 +15,8 @@ body {
 dialog {
     border: 0;
     padding: 0;
-    height: auto;
-    width: auto;
+    max-width: 100%;
+    max-height: 100%;
 }
 
 #absolute-div {
@@ -41,12 +41,12 @@ dialog {
 "use strict";
 
 function checkNotVerticallyCentered(dialog) {
-    var centeredTop = (window.innerHeight - dialog.offsetHeight) / 2;
+    var centeredTop = (document.documentElement.clientHeight - dialog.offsetHeight) / 2;
     assert_not_equals(dialog.getBoundingClientRect().top, centeredTop);
 }
 
 function checkVerticallyCentered(dialog) {
-    var centeredTop = (window.innerHeight - dialog.offsetHeight) / 2;
+    var centeredTop = (document.documentElement.clientHeight - dialog.offsetHeight) / 2;
     // Using approx equals because getBoundingClientRect() and centeredTop
     // are calculated by different parts of the engine. Due to the loss
     // of precision, the numbers might not equal exactly.
@@ -74,22 +74,6 @@ test(function() {
     checkVerticallyCentered(dialog);
 }, "showModal() should center in the viewport");
 
-test(function() {
-    this.add_cleanup(reset);
-
-    assert_equals(window.getComputedStyle(dialog).top, 'auto');
-    assert_equals(window.getComputedStyle(dialog).bottom, 'auto');
-
-    dialog.style.height = '20px';
-    dialog.showModal();
-
-    assert_not_equals(window.getComputedStyle(dialog).top, 'auto');
-    assert_not_equals(window.getComputedStyle(dialog).bottom, 'auto');
-
-    // Set back original value to 'height'.
-    dialog.style.height = 'auto';
-}, "The dialog is a positioned element, so the top and bottom should not have style auto.");
-
 test(function() {
     this.add_cleanup(reset);
 
@@ -122,7 +106,7 @@ test(function() {
     assert_equals(dialog.getBoundingClientRect().top, 0);
 
     // Set back original value to 'height'.
-    dialog.style.height = 'auto';
+    dialog.style.height = 'fit-content';
 }, "A tall dialog should be positioned at the top of the viewport.");
 
 test(function() {
@@ -167,13 +151,12 @@ test(function() {
     relativeContainer.appendChild(dialog);
 
     dialog.showModal();
-    assert_not_equals(dialog.getBoundingClientRect().top, relativeContainer.getBoundingClientRect().top);
+    checkVerticallyCentered(dialog);
     dialog.remove();
 
     relativeContainer.appendChild(dialog);
-    assert_equals(dialog.parentNode, relativeContainer);
-    assert_equals(dialog.getBoundingClientRect().top, relativeContainer.getBoundingClientRect().top);
-}, "Dialog should lose centering when removed from the document.");
+    checkVerticallyCentered(dialog);
+}, "Dialog should still be centered when removed, and re-added to the document.");
 
 test(function() {
     this.add_cleanup(reset);
@@ -186,7 +169,7 @@ test(function() {
     assert_equals(dialog.getBoundingClientRect().top, expectedTop);
 
     // Set back original value to 'top'.
-    dialog.style.top = 'auto';
+    dialog.style.top = '0';
 }, "Dialog's specified position should survive after close() and showModal().");
 
 test(function() {
@@ -194,43 +177,7 @@ test(function() {
 
     dialog.showModal();
     dialog.removeAttribute('open');
-    window.scroll(0, window.scrollY * 2);
-    checkNotVerticallyCentered(dialog);
     dialog.showModal();
     checkVerticallyCentered(dialog);
 }, "Dialog should be recentered if showModal() is called after removing 'open'.");
-
-test(function() {
-    this.add_cleanup(reset);
-
-    dialog.remove();
-    absoluteContainer.appendChild(dialog);
-    absoluteContainer.style.display = 'none';
-    dialog.showModal();
-    absoluteContainer.style.display = 'block';
-    // Since dialog's containing block is the ICB, it's statically positioned after <body>.
-    assert_equals(dialog.getBoundingClientRect().top, document.body.getBoundingClientRect().bottom);
-}, "Dialog should not be centered if showModal() was called when an ancestor had display 'none'.");
-
-test(function() {
-    this.add_cleanup(reset);
-
-    var offset = 50;
-    dialog.style.top = offset + 'px';
-    dialog.showModal();
-    assert_equals(dialog.getBoundingClientRect().top + window.scrollY, offset);
-    // Set back original value to 'top'.
-    dialog.style.top = 'auto';
-}, "A dialog with specified 'top' should be positioned as usual");
-
-test(function() {
-    this.add_cleanup(reset);
-
-    var offset = 50;
-    dialog.style.bottom = offset + 'px';
-    dialog.showModal();
-    assert_equals(dialog.getBoundingClientRect().bottom + window.scrollY, window.innerHeight - offset);
-    // Set back original value to 'bottom'.
-    dialog.style.bottom = 'auto';
-}, "A dialog with specified 'bottom' should be positioned as usual");
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/centering-iframe.sub.html b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/centering-iframe.sub.html
index 2f9721eee86..01377de4269 100644
--- a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/centering-iframe.sub.html
+++ b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/centering-iframe.sub.html
@@ -14,7 +14,8 @@
     writing-mode: {{GET[dialog-writing-mode]}};
     border: none;
     padding: 0;
-    margin: 0;
+    max-width: initial;
+    max-height: initial;
   }
 </style>
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/centering.html b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/centering.html
index 4c97ea078c5..62f4fc2519c 100644
--- a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/centering.html
+++ b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/centering.html
@@ -11,30 +11,33 @@
 "use strict";
 
 // Be sure to sync with centering-iframe.html
-const DIALOG_WIDTH = 20;
-const DIALOG_HEIGHT = 10;
+const dialogWidth = 20;
+const dialogHeight = 10;
 
-testDialogCentering("horizontal-tb", "", "", "tall viewport", 40, 100, "top", 100 / 2 - DIALOG_HEIGHT / 2);
-testDialogCentering("horizontal-tb", "", "", "wide viewport", 100, 40, "top", 40 / 2 - DIALOG_HEIGHT / 2);
-testDialogCentering("horizontal-tb", "", "", "square viewport", 100, 100, "top", 100 / 2 - DIALOG_HEIGHT / 2);
-testDialogCentering("horizontal-tb", "", "", "dialog and viewport match", DIALOG_WIDTH, DIALOG_HEIGHT, "top", 0);
-testDialogCentering("horizontal-tb", "", "", "dialog bigger than viewport", 100, DIALOG_HEIGHT / 2, "top", 0);
+const widthOffset100 = 100 / 2 - dialogWidth / 2;
+const widthOffset40 = 40 / 2 - dialogWidth / 2;
 
-testDialogCentering("vertical-rl", "", "", "tall viewport", 40, 100, "left", 40 / 2 - DIALOG_WIDTH / 2);
-testDialogCentering("vertical-lr", "", "", "tall viewport", 40, 100, "right", 40 / 2 - DIALOG_WIDTH / 2);
-testDialogCentering("vertical-lr", "", "", "dialog bigger than viewport", DIALOG_WIDTH / 2, 100, "right", 0);
+const heightOffset100 = 100 / 2 - dialogHeight / 2;
+const heightOffset40 = 40 / 2 - dialogHeight / 2;
 
-testDialogCentering("vertical-rl", "", "horizontal-tb", "tall viewport", 40, 100, "left", 40 / 2 - DIALOG_WIDTH / 2);
-testDialogCentering("vertical-lr", "", "horizontal-tb", "tall viewport", 40, 100, "right", 40 / 2 - DIALOG_WIDTH / 2);
-testDialogCentering("vertical-lr", "", "horizontal-tb", "dialog bigger than viewport", DIALOG_WIDTH / 2, 100, "right", 0);
+testDialogCentering("horizontal-tb", "", "", "tall viewport", 40, 100, widthOffset40, heightOffset100);
+testDialogCentering("horizontal-tb", "", "", "wide viewport", 100, 40, widthOffset100, heightOffset40);
+testDialogCentering("horizontal-tb", "", "", "square viewport", 100, 100, widthOffset100, heightOffset100);
+testDialogCentering("horizontal-tb", "", "", "dialog and viewport match", dialogWidth, dialogHeight, 0, 0);
 
-testDialogCentering("horizontal-tb", "vertical-rl", "", "tall viewport", 40, 100, "right", 40 / 2 - DIALOG_WIDTH / 2);
-testDialogCentering("vertical-rl", "horizontal-tb", "", "tall viewport", 40, 100, "top", 100 / 2 - DIALOG_HEIGHT / 2);
+testDialogCentering("vertical-rl", "", "", "tall viewport", 40, 100, widthOffset40, heightOffset100);
+testDialogCentering("vertical-lr", "", "", "tall viewport", 40, 100, widthOffset40, heightOffset100);
 
-testDialogCentering("horizontal-tb", "vertical-rl", "horizontal-tb", "tall viewport", 40, 100, "right", 40 / 2 - DIALOG_WIDTH / 2);
-testDialogCentering("vertical-rl", "horizontal-tb", "vertical-rl", "tall viewport", 40, 100, "top", 100 / 2 - DIALOG_HEIGHT / 2);
+testDialogCentering("vertical-rl", "", "horizontal-tb", "tall viewport", 40, 100, widthOffset40, heightOffset100);
+testDialogCentering("vertical-lr", "", "horizontal-tb", "tall viewport", 40, 100, widthOffset40, heightOffset100);
 
-function testDialogCentering(writingMode, containerWritingMode, dialogWritingMode, label, iframeWidth, iframeHeight, property, numericValue) {
+testDialogCentering("horizontal-tb", "vertical-rl", "", "tall viewport", 40, 100, widthOffset40, heightOffset100);
+testDialogCentering("vertical-rl", "horizontal-tb", "", "tall viewport", 40, 100, widthOffset40, heightOffset100);
+
+testDialogCentering("horizontal-tb", "vertical-rl", "horizontal-tb", "tall viewport", 40, 100, widthOffset40, heightOffset100);
+testDialogCentering("vertical-rl", "horizontal-tb", "vertical-rl", "tall viewport", 40, 100, widthOffset40, heightOffset100);
+
+function testDialogCentering(writingMode, containerWritingMode, dialogWritingMode, label, iframeWidth, iframeHeight, leftOffset, topOffset) {
   async_test(t => {
     const iframe = document.createElement("iframe");
     iframe.src = `centering-iframe.sub.html?html-writing-mode=${writingMode}&container-writing-mode=${containerWritingMode}&dialog-writing-mode=${dialogWritingMode}`;
@@ -42,19 +45,10 @@ function testDialogCentering(writingMode, containerWritingMode, dialogWritingMod
     iframe.height = iframeHeight;
     iframe.onload = t.step_func_done(() => {
       const dialog = iframe.contentDocument.querySelector("dialog");
-      const dialogStyle = iframe.contentWindow.getComputedStyle(dialog);
-      assert_equals(dialogStyle[property], numericValue + "px");
-      assert_equals(dialogStyle['inset-inline-start'], "0px");
-      assert_equals(dialogStyle['inset-inline-end'], "0px");
+      const dialogRect = dialog.getBoundingClientRect();
 
-      const dialogWM = dialogWritingMode || containerWritingMode || writingMode || "horizontal-tb";
-      if (dialogWM.startsWith("vertical")) {
-        assert_equals(dialogStyle['top'], "0px");
-        assert_equals(dialogStyle['bottom'], "0px");
-      } else {
-        assert_equals(dialogStyle['left'], "0px");
-        assert_equals(dialogStyle['right'], "0px");
-      }
+      assert_equals(dialogRect.left, leftOffset, 'left');
+      assert_equals(dialogRect.top, topOffset, 'top');
     });
     document.body.appendChild(iframe);
   }, writingMode + (containerWritingMode ? ` (container ${containerWritingMode})` : "") +
diff --git a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-scrolled-viewport.html b/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-scrolled-viewport.html
deleted file mode 100644
index 8a59ba23e43..00000000000
--- a/tests/wpt/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-scrolled-viewport.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-body {
-    margin: 0;
-}
-
-dialog {
-    padding : 0;
-}
-</style>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-<body style="height: 10000px; width: 10000px">
-<div style="position: absolute; top: 5000px; left: 5000px; width: 20px;">
-    <dialog style="top: 1200px; left: 1200px; right: auto; height: 100px; width: 50%;">
-    </dialog>
-</div>
-<script>
-"use strict";
-function checkPosition(dialog) {
-    assert_equals(dialog.offsetParent, null);
-    assert_equals(dialog.offsetTop, 1200);
-    assert_equals(dialog.offsetLeft, 1200);
-    // Since dialog's 'width' is '50%', the expected width is half of the
-    // viewport width, but viewport width may be odd.
-    var expectedWidth = document.documentElement.clientWidth / 2;
-    assert_approx_equals(dialog.clientWidth, expectedWidth, 0.5);
-}
-
-test(function() {
-  // The dialog should be onscreen with a width of 50% of the viewport. It is the child of a
-  // narrow element positioned off screen, but its containing block is the initial containing
-  // block, so its position and percent lengths are relative to that.
-  window.scroll(1000, 1000);
-  var dialog = document.querySelector('dialog');
-  dialog.showModal();
-  checkPosition(dialog);
-  dialog.close();
-}, "Tests modal dialog's containing block is the initial containing block");
-</script>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/html/user-activation/activation-thru-contextmenu-event-manual.html b/tests/wpt/web-platform-tests/html/user-activation/activation-thru-contextmenu-event.html
similarity index 68%
rename from tests/wpt/web-platform-tests/html/user-activation/activation-thru-contextmenu-event-manual.html
rename to tests/wpt/web-platform-tests/html/user-activation/activation-thru-contextmenu-event.html
index 998bac3694c..7f84577b7f0 100644
--- a/tests/wpt/web-platform-tests/html/user-activation/activation-thru-contextmenu-event-manual.html
+++ b/tests/wpt/web-platform-tests/html/user-activation/activation-thru-contextmenu-event.html
@@ -8,6 +8,9 @@
     <link rel="help" href="https://html.spec.whatwg.org/#triggered-by-user-activation">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-actions.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
     <style>
       #target {
         width: 250px;
@@ -28,12 +31,16 @@
       function run() {
         let success = false;
         let test_contextmenu = async_test("'contextmenu' can call vibrate.");
+        let actions_promise;
+        var target = document.getElementById("target");
+        var button = document.getElementById("done");
 
         on_event(document.getElementById("done"), "click", () => {
           test_contextmenu.step(() => {
             assert_true(activation_event_fired, "activation event has fired");
           });
-          test_contextmenu.done();
+          // Make sure the test finishes after all the input actions are completed.
+          actions_promise.then(() => test_contextmenu.done());
         });
 
         on_event(document.getElementById("target"), "contextmenu", (e) => {
@@ -43,6 +50,17 @@
               activation_event_fired = true;
             });
         });
+
+        // Inject mouse inputs.
+        var actions = new test_driver.Actions();
+        actions_promise = actions
+            .pointerMove(0, 0, {origin: target})
+            .pointerDown({button: actions.ButtonType.RIGHT})
+            .pointerUp({button: actions.ButtonType.RIGHT})
+            .pointerMove(0, 0, {origin: button})
+            .pointerDown()
+            .pointerUp()
+            .send();
       }
     </script>
   </head>
diff --git a/tests/wpt/web-platform-tests/import-maps/META.yml b/tests/wpt/web-platform-tests/import-maps/META.yml
new file mode 100644
index 00000000000..bc6d40ec352
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/META.yml
@@ -0,0 +1,4 @@
+spec: https://github.com/WICG/import-maps
+suggested_reviewers:
+  - domenic
+  - hiroshige-g
diff --git a/tests/wpt/web-platform-tests/import-maps/README.md b/tests/wpt/web-platform-tests/import-maps/README.md
deleted file mode 100644
index 3803e350c84..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Tests for [Import Maps](https://github.com/WICG/import-maps).
-
-Because the spec itself is still under development and there are ongoing spec
-discussions, the tests are all tentative.
-
-Also, some tests are based on Chromium's behavior which reflects an older
-version of import maps spec ("package name maps" around May 2018), and have
-dependency to Chromium's implementation (internals.resolveModuleSpecifier).
-These dependencies should be removed, once the spec matures.
diff --git a/tests/wpt/web-platform-tests/import-maps/acquire-import-maps-flag/worker-request/success.tentative.html b/tests/wpt/web-platform-tests/import-maps/acquire-import-maps-flag/worker-request/success.tentative.html
deleted file mode 100644
index ceef4100aad..00000000000
--- a/tests/wpt/web-platform-tests/import-maps/acquire-import-maps-flag/worker-request/success.tentative.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-// https://github.com/WICG/import-maps/blob/master/spec.md#when-import-maps-can-be-encountered
-const t = async_test(
-  'After module worker creation, import maps should fire error events');
-const log = [];
-new Worker('../../resources/empty.js?pipe=trickle(d1)', {type: "module"});
-</script>
-<script type="importmap" onerror="t.done()">
-{
-  "imports": {
-    "../../resources/log.js?pipe=sub&name=A": "../../resources/log.js?pipe=sub&name=B"
-  }
-}
-</script>
-<script>
-promise_test(() => {
-  return import("../../resources/log.js?pipe=sub&name=A")
-    .then(() => assert_array_equals(log, ["A"]))
-  },
-  'After module worker creation import maps are not effective');
-</script>
diff --git a/tests/wpt/web-platform-tests/import-maps/acquiring/README.md b/tests/wpt/web-platform-tests/import-maps/acquiring/README.md
new file mode 100644
index 00000000000..189d1902179
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/acquiring/README.md
@@ -0,0 +1 @@
+These tests are about the impact of the [acquiring import maps](https://wicg.github.io/import-maps/#document-acquiring-import-maps) boolean, which prevents import maps from taking effect after a module import has started.
diff --git a/tests/wpt/web-platform-tests/import-maps/acquire-import-maps-flag/dynamic-import/success.tentative.html b/tests/wpt/web-platform-tests/import-maps/acquiring/dynamic-import.html
similarity index 74%
rename from tests/wpt/web-platform-tests/import-maps/acquire-import-maps-flag/dynamic-import/success.tentative.html
rename to tests/wpt/web-platform-tests/import-maps/acquiring/dynamic-import.html
index 512cd7fa697..49d8a701da2 100644
--- a/tests/wpt/web-platform-tests/import-maps/acquire-import-maps-flag/dynamic-import/success.tentative.html
+++ b/tests/wpt/web-platform-tests/import-maps/acquiring/dynamic-import.html
@@ -3,7 +3,6 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
-// https://github.com/WICG/import-maps/blob/master/spec.md#when-import-maps-can-be-encountered
 const t = async_test(
   'After dynamic imports, import maps should fire error events');
 const log = [];
@@ -12,19 +11,19 @@ const log = [];
 // first attempt to resolve a module specifier, trickle(d1) is used to ensure
 // the following import map is added after module loading is triggered but
 // before the first module script is parsed.
-promise_test(() => import('../../resources/empty.js?pipe=trickle(d1)'),
+promise_test(() => import('../resources/empty.js?pipe=trickle(d1)'),
              "A dynamic import succeeds");
 </script>
 <script type="importmap" onload="t.assert_unreached('onload')" onerror="t.done()">
 {
   "imports": {
-    "../../resources/log.js?pipe=sub&name=A": "../../resources/log.js?pipe=sub&name=B"
+    "../resources/log.js?pipe=sub&name=A": "../resources/log.js?pipe=sub&name=B"
   }
 }
 </script>
 <script>
 promise_test(() => {
-  return import("../../resources/log.js?pipe=sub&name=A")
+  return import("../resources/log.js?pipe=sub&name=A")
     .then(() => assert_array_equals(log, ["log:A"]))
   },
   'After a dynamic import(), import maps are not effective');
diff --git a/tests/wpt/web-platform-tests/import-maps/acquire-import-maps-flag/script-tag/success.tentative.html b/tests/wpt/web-platform-tests/import-maps/acquiring/script-tag.html
similarity index 60%
rename from tests/wpt/web-platform-tests/import-maps/acquire-import-maps-flag/script-tag/success.tentative.html
rename to tests/wpt/web-platform-tests/import-maps/acquiring/script-tag.html
index 7f319b04758..2792c2a31d9 100644
--- a/tests/wpt/web-platform-tests/import-maps/acquire-import-maps-flag/script-tag/success.tentative.html
+++ b/tests/wpt/web-platform-tests/import-maps/acquiring/script-tag.html
@@ -3,22 +3,21 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
-// https://github.com/WICG/import-maps/blob/master/spec.md#when-import-maps-can-be-encountered
 const t = async_test(
   'After <script type="module"> import maps should fire error events');
 const log = [];
 </script>
-<script type="module" src="../../resources/empty.js?pipe=trickle(d1)"></script>
+<script type="module" src="../resources/empty.js?pipe=trickle(d1)"></script>
 <script type="importmap" onerror="t.done()">
 {
   "imports": {
-    "../../resources/log.js?pipe=sub&name=A": "../../resources/log.js?pipe=sub&name=B"
+    "../resources/log.js?pipe=sub&name=A": "../resources/log.js?pipe=sub&name=B"
   }
 }
 </script>
 <script>
 promise_test(() => {
-  return import("../../resources/log.js?pipe=sub&name=A")
+  return import("../resources/log.js?pipe=sub&name=A")
     .then(() => assert_array_equals(log, ["log:A"]))
   },
   'After <script type="module"> import maps are not effective');
diff --git a/tests/wpt/web-platform-tests/import-maps/core/module-map-key.tentative.html b/tests/wpt/web-platform-tests/import-maps/acquiring/worker-request.html
similarity index 54%
rename from tests/wpt/web-platform-tests/import-maps/core/module-map-key.tentative.html
rename to tests/wpt/web-platform-tests/import-maps/acquiring/worker-request.html
index 6f2f18a02e1..05474ddff2b 100644
--- a/tests/wpt/web-platform-tests/import-maps/core/module-map-key.tentative.html
+++ b/tests/wpt/web-platform-tests/import-maps/acquiring/worker-request.html
@@ -2,6 +2,10 @@
 <html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script>
+const log = [];
+new Worker('../resources/empty.js?pipe=trickle(d1)', {type: "module"});
+</script>
 <script type="importmap">
 {
   "imports": {
@@ -10,16 +14,9 @@
 }
 </script>
 <script>
-const log = [];
-
-// This test reflects the Chromium's current implementation.
-// If the import map resolution is moved into the fetch spec, the module map's
-// key will become the URL/specifier BEFORE import map resolution.
-// https://crbug.com/928435
 promise_test(() => {
   return import("../resources/log.js?pipe=sub&name=A")
-    .then(() => import("../resources/log.js?pipe=sub&name=B"))
     .then(() => assert_array_equals(log, ["log:B"]))
   },
-  "Module map's key is the URL after import map resolution");
+  'After module worker creation import maps are still effective');
 </script>
diff --git a/tests/wpt/web-platform-tests/import-maps/core/bare.sub.tentative.html b/tests/wpt/web-platform-tests/import-maps/bare-specifiers.sub.html
similarity index 75%
rename from tests/wpt/web-platform-tests/import-maps/core/bare.sub.tentative.html
rename to tests/wpt/web-platform-tests/import-maps/bare-specifiers.sub.html
index 7fb769e09a2..d087cb31c44 100644
--- a/tests/wpt/web-platform-tests/import-maps/core/bare.sub.tentative.html
+++ b/tests/wpt/web-platform-tests/import-maps/bare-specifiers.sub.html
@@ -2,7 +2,7 @@
 <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 src="resources/test-helper.js"></script>
 
 <script>
 // "bare/..." (i.e. without leading "./") are bare specifiers
@@ -10,7 +10,7 @@
 const importMap = `
 {
   "imports": {
-    "bare/bare": "../resources/log.js?pipe=sub&name=bare",
+    "bare/bare": "./resources/log.js?pipe=sub&name=bare",
     "bare/cross-origin-bare": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-bare",
     "bare/to-data": "data:text/javascript,log.push('dataURL')",
 
@@ -26,11 +26,6 @@ const tests = {
   // - 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 HTTP(S).
   "bare/bare":
     [Result.URL, Result.URL, "log:bare", "log:bare"],
diff --git a/tests/wpt/web-platform-tests/import-maps/bare/README.md b/tests/wpt/web-platform-tests/import-maps/bare/README.md
new file mode 100644
index 00000000000..ce312530ed4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/bare/README.md
@@ -0,0 +1 @@
+This directory contains resources which might get imported, post-mapping. The exact URLs are important, which is why we don't place it under resources/ or similar.
diff --git a/tests/wpt/web-platform-tests/import-maps/core/bare/__dir__.headers b/tests/wpt/web-platform-tests/import-maps/bare/__dir__.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/core/bare/__dir__.headers
rename to tests/wpt/web-platform-tests/import-maps/bare/__dir__.headers
diff --git a/tests/wpt/web-platform-tests/import-maps/core/bare/bare b/tests/wpt/web-platform-tests/import-maps/bare/bare
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/core/bare/bare
rename to tests/wpt/web-platform-tests/import-maps/bare/bare
diff --git a/tests/wpt/web-platform-tests/import-maps/core/bare/cross-origin-bare b/tests/wpt/web-platform-tests/import-maps/bare/cross-origin-bare
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/core/bare/cross-origin-bare
rename to tests/wpt/web-platform-tests/import-maps/bare/cross-origin-bare
diff --git a/tests/wpt/web-platform-tests/import-maps/core/bare/to-bare b/tests/wpt/web-platform-tests/import-maps/bare/to-bare
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/core/bare/to-bare
rename to tests/wpt/web-platform-tests/import-maps/bare/to-bare
diff --git a/tests/wpt/web-platform-tests/import-maps/core/bare/to-data b/tests/wpt/web-platform-tests/import-maps/bare/to-data
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/core/bare/to-data
rename to tests/wpt/web-platform-tests/import-maps/bare/to-data
diff --git a/tests/wpt/web-platform-tests/import-maps/csp/applied-to-target-dynamic.sub.tentative.html b/tests/wpt/web-platform-tests/import-maps/csp/applied-to-target-dynamic.sub.html
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/csp/applied-to-target-dynamic.sub.tentative.html
rename to tests/wpt/web-platform-tests/import-maps/csp/applied-to-target-dynamic.sub.html
diff --git a/tests/wpt/web-platform-tests/import-maps/csp/applied-to-target.sub.tentative.html b/tests/wpt/web-platform-tests/import-maps/csp/applied-to-target.sub.html
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/csp/applied-to-target.sub.tentative.html
rename to tests/wpt/web-platform-tests/import-maps/csp/applied-to-target.sub.html
diff --git a/tests/wpt/web-platform-tests/import-maps/csp/hash-failure.tentative.html b/tests/wpt/web-platform-tests/import-maps/csp/hash-failure.html
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/csp/hash-failure.tentative.html
rename to tests/wpt/web-platform-tests/import-maps/csp/hash-failure.html
diff --git a/tests/wpt/web-platform-tests/import-maps/csp/hash.tentative.html b/tests/wpt/web-platform-tests/import-maps/csp/hash.html
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/csp/hash.tentative.html
rename to tests/wpt/web-platform-tests/import-maps/csp/hash.html
diff --git a/tests/wpt/web-platform-tests/import-maps/csp/nonce-failure.tentative.html b/tests/wpt/web-platform-tests/import-maps/csp/nonce-failure.html
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/csp/nonce-failure.tentative.html
rename to tests/wpt/web-platform-tests/import-maps/csp/nonce-failure.html
diff --git a/tests/wpt/web-platform-tests/import-maps/csp/nonce.tentative.html b/tests/wpt/web-platform-tests/import-maps/csp/nonce.html
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/csp/nonce.tentative.html
rename to tests/wpt/web-platform-tests/import-maps/csp/nonce.html
diff --git a/tests/wpt/web-platform-tests/import-maps/csp/unsafe-inline.tentative.html b/tests/wpt/web-platform-tests/import-maps/csp/unsafe-inline.html
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/csp/unsafe-inline.tentative.html
rename to tests/wpt/web-platform-tests/import-maps/csp/unsafe-inline.html
diff --git a/tests/wpt/web-platform-tests/import-maps/common/README.md b/tests/wpt/web-platform-tests/import-maps/data-driven/README.md
similarity index 98%
rename from tests/wpt/web-platform-tests/import-maps/common/README.md
rename to tests/wpt/web-platform-tests/import-maps/data-driven/README.md
index 6092c0d7670..60c415f1863 100644
--- a/tests/wpt/web-platform-tests/import-maps/common/README.md
+++ b/tests/wpt/web-platform-tests/import-maps/data-driven/README.md
@@ -1,4 +1,4 @@
-# Import maps test JSON format
+# Data-driven import maps tests
 
 In this directory, test inputs and expectations are expressed as JSON files.
 This is in order to share the same JSON files between WPT tests and Jest-based
diff --git a/tests/wpt/web-platform-tests/import-maps/common/parsing.tentative.https.html b/tests/wpt/web-platform-tests/import-maps/data-driven/parsing-internal.https.html
similarity index 97%
rename from tests/wpt/web-platform-tests/import-maps/common/parsing.tentative.https.html
rename to tests/wpt/web-platform-tests/import-maps/data-driven/parsing-internal.https.html
index 0dc9e24c8d8..7d45ae8c33b 100644
--- a/tests/wpt/web-platform-tests/import-maps/common/parsing.tentative.https.html
+++ b/tests/wpt/web-platform-tests/import-maps/data-driven/parsing-internal.https.html
@@ -9,7 +9,7 @@ globalThis.useInternalMethods = true;
 </script>
 <body>
 <script type="module">
-import { runTestsFromJSON, setupGlobalCleanup } from "./resources/common-test-helper.js";
+import { runTestsFromJSON, setupGlobalCleanup } from "./resources/test-helper.js";
 
 const promises = [];
 
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resolving-internal.tentative.https.html b/tests/wpt/web-platform-tests/import-maps/data-driven/resolving-internal.https.html
similarity index 93%
rename from tests/wpt/web-platform-tests/import-maps/common/resolving-internal.tentative.https.html
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resolving-internal.https.html
index a9f7c82fd87..887b7474d63 100644
--- a/tests/wpt/web-platform-tests/import-maps/common/resolving-internal.tentative.https.html
+++ b/tests/wpt/web-platform-tests/import-maps/data-driven/resolving-internal.https.html
@@ -7,12 +7,12 @@
 // This test file is for resolution tests that require Chromium's internal
 // methods.
 // For tests that don't use Chromium's internal methods, see
-// resolving.tentative.https.html.
+// resolving.https.html.
 globalThis.useInternalMethods = true;
 </script>
 <body>
 <script type="module">
-import { runTestsFromJSON, setupGlobalCleanup } from "./resources/common-test-helper.js";
+import { runTestsFromJSON, setupGlobalCleanup } from "./resources/test-helper.js";
 
 const promises = [];
 
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resolving.tentative.https.html b/tests/wpt/web-platform-tests/import-maps/data-driven/resolving.https.html
similarity index 97%
rename from tests/wpt/web-platform-tests/import-maps/common/resolving.tentative.https.html
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resolving.https.html
index abb30e0afa4..40b7ef5dae5 100644
--- a/tests/wpt/web-platform-tests/import-maps/common/resolving.tentative.https.html
+++ b/tests/wpt/web-platform-tests/import-maps/data-driven/resolving.https.html
@@ -5,7 +5,7 @@
 <script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
 <body>
 <script type="module">
-import { runTestsFromJSON, setupGlobalCleanup } from "./resources/common-test-helper.js";
+import { runTestsFromJSON, setupGlobalCleanup } from "./resources/test-helper.js";
 
 const promises = [];
 
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/data-base-url.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/data-base-url.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/data-base-url.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/data-base-url.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/empty-import-map-internal.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/empty-import-map-internal.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/empty-import-map-internal.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/empty-import-map-internal.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/empty-import-map.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/empty-import-map.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/empty-import-map.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/empty-import-map.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/overlapping-entries.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/overlapping-entries.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/overlapping-entries.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/overlapping-entries.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/packages-via-trailing-slashes.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/packages-via-trailing-slashes.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/packages-via-trailing-slashes.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-addresses-absolute.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-addresses-absolute.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/parsing-addresses-absolute.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-addresses-absolute.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-addresses-invalid.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-addresses-invalid.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/parsing-addresses-invalid.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-addresses-invalid.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-addresses.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-addresses.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/parsing-addresses.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-addresses.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-invalid-json.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-invalid-json.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/parsing-invalid-json.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-invalid-json.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-normalization.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-schema-normalization.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-normalization.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-schema-normalization.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-scope.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-schema-scope.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-scope.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-schema-scope.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-specifier-map.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-schema-specifier-map.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-specifier-map.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-schema-specifier-map.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-toplevel.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-schema-toplevel.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/parsing-schema-toplevel.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-schema-toplevel.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-scope-keys.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-scope-keys.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/parsing-scope-keys.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-scope-keys.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-specifier-keys.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-specifier-keys.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/parsing-specifier-keys.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-specifier-keys.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/parsing-trailing-slashes.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-trailing-slashes.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/parsing-trailing-slashes.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/parsing-trailing-slashes.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/resolving-null.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/resolving-null.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/resolving-null.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/resolving-null.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/scopes-exact-vs-prefix.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/scopes-exact-vs-prefix.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/scopes-exact-vs-prefix.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/scopes-exact-vs-prefix.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/scopes.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/scopes.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/scopes.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/scopes.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/common-test-helper-iframe.js b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/test-helper-iframe.js
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/common-test-helper-iframe.js
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/test-helper-iframe.js
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/common-test-helper.js b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/test-helper.js
similarity index 97%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/common-test-helper.js
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/test-helper.js
index 2bf99184a0c..0f53aea5b4b 100644
--- a/tests/wpt/web-platform-tests/import-maps/common/resources/common-test-helper.js
+++ b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/test-helper.js
@@ -7,7 +7,7 @@ const scope = './scope/';
 
 // Global setup: this must be the first promise_test.
 promise_test(async (t) => {
-  const script = 'common-test-service-worker.js';
+  const script = 'service-worker.js';
 
   registration =
       await service_worker_unregister_and_register(t, script, scope);
@@ -38,7 +38,7 @@ function parse(importMap, importMapBaseURL) {
 
     const testHTML = `
       <body>
-      <script src="${location.origin}/import-maps/common/resources/common-test-helper-iframe.js"></script>
+      <script src="${location.origin}/import-maps/data-driven/resources/test-helper-iframe.js"></script>
       <script type="importmap" onerror="onScriptError(event)">
       ${importMapString}
       </script>
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/tricky-specifiers.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/tricky-specifiers.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/tricky-specifiers.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/tricky-specifiers.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/resources/url-specifiers.json b/tests/wpt/web-platform-tests/import-maps/data-driven/resources/url-specifiers.json
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/resources/url-specifiers.json
rename to tests/wpt/web-platform-tests/import-maps/data-driven/resources/url-specifiers.json
diff --git a/tests/wpt/web-platform-tests/import-maps/common/common-test-service-worker.js b/tests/wpt/web-platform-tests/import-maps/data-driven/service-worker.js
similarity index 91%
rename from tests/wpt/web-platform-tests/import-maps/common/common-test-service-worker.js
rename to tests/wpt/web-platform-tests/import-maps/data-driven/service-worker.js
index 6985c901fa6..68f293bfbfb 100644
--- a/tests/wpt/web-platform-tests/import-maps/common/common-test-service-worker.js
+++ b/tests/wpt/web-platform-tests/import-maps/data-driven/service-worker.js
@@ -6,7 +6,7 @@ self.addEventListener('message', event => {
 });
 
 self.addEventListener('fetch', event => {
-    if (event.request.url.indexOf('common-test-helper-iframe.js') >= 0) {
+    if (event.request.url.indexOf('test-helper-iframe.js') >= 0) {
       return;
     }
     if (serveImporterScript) {
diff --git a/tests/wpt/web-platform-tests/import-maps/common/tools/format_json.py b/tests/wpt/web-platform-tests/import-maps/data-driven/tools/format_json.py
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/common/tools/format_json.py
rename to tests/wpt/web-platform-tests/import-maps/data-driven/tools/format_json.py
diff --git a/tests/wpt/web-platform-tests/import-maps/core/data.sub.tentative.html b/tests/wpt/web-platform-tests/import-maps/data-url-specifiers.sub.html
similarity index 75%
rename from tests/wpt/web-platform-tests/import-maps/core/data.sub.tentative.html
rename to tests/wpt/web-platform-tests/import-maps/data-url-specifiers.sub.html
index 25c18c45b7d..a6fa12c1266 100644
--- a/tests/wpt/web-platform-tests/import-maps/core/data.sub.tentative.html
+++ b/tests/wpt/web-platform-tests/import-maps/data-url-specifiers.sub.html
@@ -2,7 +2,7 @@
 <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 src="resources/test-helper.js"></script>
 
 <script>
 // "bare/..." (i.e. without leading "./") are bare specifiers
@@ -10,9 +10,9 @@
 const importMap = `
 {
   "imports": {
-    "bare": "../resources/log.js?pipe=sub&name=bare",
+    "bare": "./resources/log.js?pipe=sub&name=bare",
 
-    "data:text/javascript,log.push('data:foo')": "../resources/log.js?pipe=sub&name=foo",
+    "data:text/javascript,log.push('data:foo')": "./resources/log.js?pipe=sub&name=foo",
     "data:text/javascript,log.push('data:cross-origin-foo')": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-foo",
     "data:text/javascript,log.push('data:to-data')": "data:text/javascript,log.push('dataURL')",
 
@@ -28,11 +28,6 @@ const tests = {
   // - 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 HTTP(S).
   "data:text/javascript,log.push('data:foo')":
     [Result.URL, Result.URL, "log:foo", "log:foo"],
diff --git a/tests/wpt/web-platform-tests/import-maps/core/http.sub.tentative.html b/tests/wpt/web-platform-tests/import-maps/http-url-like-specifiers.sub.html
similarity index 59%
rename from tests/wpt/web-platform-tests/import-maps/core/http.sub.tentative.html
rename to tests/wpt/web-platform-tests/import-maps/http-url-like-specifiers.sub.html
index a33a0945e31..ba5182354cb 100644
--- a/tests/wpt/web-platform-tests/import-maps/core/http.sub.tentative.html
+++ b/tests/wpt/web-platform-tests/import-maps/http-url-like-specifiers.sub.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="../resources/test-helper.js"></script>
+<script src="resources/test-helper.js"></script>
 
 <script>
 // "bare/..." (i.e. without leading "./") are bare specifiers
@@ -9,13 +9,13 @@
 const importMap = `
 {
   "imports": {
-    "bare": "../resources/log.js?pipe=sub&name=bare",
+    "bare": "./resources/log.js?pipe=sub&name=bare",
 
-    "../resources/log.js?pipe=sub&name=foo": "../resources/log.js?pipe=sub&name=bar",
-    "../resources/log.js?pipe=sub&name=cross-origin-foo": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-bar",
-    "../resources/log.js?pipe=sub&name=to-data": "data:text/javascript,log.push('dataURL')",
+    "./resources/log.js?pipe=sub&name=foo": "./resources/log.js?pipe=sub&name=bar",
+    "./resources/log.js?pipe=sub&name=cross-origin-foo": "https://{{domains[www1]}}:{{ports[https][0]}}/import-maps/resources/log.js?pipe=sub&name=cross-origin-bar",
+    "./resources/log.js?pipe=sub&name=to-data": "data:text/javascript,log.push('dataURL')",
 
-    "../resources/log.js?pipe=sub&name=to-bare": "bare"
+    "./resources/log.js?pipe=sub&name=to-bare": "bare"
   }
 }
 `;
@@ -27,11 +27,6 @@ const tests = {
   // - 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 HTTP(S).
   "{{location[server]}}/import-maps/resources/log.js?pipe=sub&name=foo":
     [Result.URL, Result.URL, "log:bar", "log:bar"],
diff --git a/tests/wpt/web-platform-tests/import-maps/module-map-key.html b/tests/wpt/web-platform-tests/import-maps/module-map-key.html
new file mode 100644
index 00000000000..3bf15934aa5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/import-maps/module-map-key.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script type="importmap">
+{
+  "imports": {
+    "./resources/log.js?pipe=sub&name=A": "./resources/log.js?pipe=sub&name=B"
+  }
+}
+</script>
+<script>
+const log = [];
+
+promise_test(() => {
+  return import("./resources/log.js?pipe=sub&name=A")
+    .then(() => import("./resources/log.js?pipe=sub&name=B"))
+    .then(() => assert_array_equals(log, ["log:B"]))
+  },
+  "Module map's key is the URL after import map resolution");
+</script>
diff --git a/tests/wpt/web-platform-tests/import-maps/core/not-as-classic-script.html b/tests/wpt/web-platform-tests/import-maps/not-as-classic-script.html
similarity index 100%
rename from tests/wpt/web-platform-tests/import-maps/core/not-as-classic-script.html
rename to tests/wpt/web-platform-tests/import-maps/not-as-classic-script.html
diff --git a/tests/wpt/web-platform-tests/import-maps/resources/test-helper.js b/tests/wpt/web-platform-tests/import-maps/resources/test-helper.js
index 3cb278b7989..0e870c26f16 100644
--- a/tests/wpt/web-platform-tests/import-maps/resources/test-helper.js
+++ b/tests/wpt/web-platform-tests/import-maps/resources/test-helper.js
@@ -10,9 +10,6 @@ function expect_log(test, expected_log) {
 
 // Results of resolving a specifier using import maps.
 const Result = {
-  // A built-in module (std:blank) is loaded.
-  BUILTIN: "builtin",
-
   // A failure considered as a fetch error in a module script tree.
   // <script>'s error event is fired.
   FETCH_ERROR: "fetch_error",
@@ -26,9 +23,9 @@ const Result = {
   // ------------------------- ----------------------
   // ...?name=foo              log:foo
   // data:...log('foo')        foo
-  // Others, e.g. @std/blank   relative:@std/blank
+  // Others, e.g. bare/bare    relative:bare/bare
   // ------------------------- ----------------------
-  // (The last case assumes a file `@std/blank` that logs `relative:@std/blank`
+  // (The last case assumes a file `bare/bare` that logs `relative:bare/bare`
   // exists)
   URL: "URL",
 };
@@ -79,9 +76,7 @@ function getHandlers(t, specifier, expected) {
     });
   } else {
     let expected_log;
-    if (expected === Result.BUILTIN) {
-      expected_log = [];
-    } else if (expected === Result.URL) {
+    if (expected === Result.URL) {
       const match_data_url = specifier.match(/data:.*log\.push\('(.*)'\)/);
       const match_log_js = specifier.match(/name=(.*)/);
       if (match_data_url) {
diff --git a/tests/wpt/web-platform-tests/import-maps/core/static-import.py b/tests/wpt/web-platform-tests/import-maps/static-import.py
similarity index 54%
rename from tests/wpt/web-platform-tests/import-maps/core/static-import.py
rename to tests/wpt/web-platform-tests/import-maps/static-import.py
index 68583be13c4..fcf823c113e 100644
--- a/tests/wpt/web-platform-tests/import-maps/core/static-import.py
+++ b/tests/wpt/web-platform-tests/import-maps/static-import.py
@@ -1,3 +1,7 @@
+# This file needs to be a sibling of the test files (and not under resources/)
+# so that base URL resolution is the same between those test files and <script>s
+# pointing to this file.
+
 from wptserve.utils import isomorphic_decode
 
 def main(request, response):
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/penPointerEventProperties.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/penPointerEventProperties.html.ini
index 648585f9e6d..d808b1793cf 100644
--- a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/penPointerEventProperties.html.ini
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/penPointerEventProperties.html.ini
@@ -3,4 +3,4 @@
     if product == "firefox": ERROR
   [TestDriver actions: pointerevent properties of pen type]
     expected:
-      if product == "safari": FAIL
+      if product == "safari" or product == "firefox": FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/penPointerEvents.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/penPointerEvents.html.ini
new file mode 100644
index 00000000000..39e05a8f090
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/penPointerEvents.html.ini
@@ -0,0 +1,6 @@
+[penPointerEvents.html]
+  expected:
+    if product == "firefox": ERROR
+  [TestDriver actions: pointerevent properties of pen type]
+    expected:
+      if product == "safari": FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/touchPointerEventProperties.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/touchPointerEventProperties.html.ini
new file mode 100644
index 00000000000..ef77aac0d1f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/touchPointerEventProperties.html.ini
@@ -0,0 +1,6 @@
+[touchPointerEventProperties.html]
+  expected:
+    if product == "firefox": ERROR
+  [TestDriver actions: pointerevent properties of touch type]
+    expected:
+      if product == "safari" or product == "firefox": FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testharness/lone-surrogates.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testharness/lone-surrogates.html.ini
new file mode 100644
index 00000000000..6505d896a9c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testharness/lone-surrogates.html.ini
@@ -0,0 +1,7 @@
+[lone-surrogates.html]
+  [failing test with lone surrogate in assert]
+    expected: FAIL
+
+  [failing test with lone surrogate U+d800 in name]
+    expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/penPointerEventProperties.html b/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/penPointerEventProperties.html
index c5a2b1c06d9..ba6c15f0225 100644
--- a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/penPointerEventProperties.html
+++ b/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/penPointerEventProperties.html
@@ -23,63 +23,49 @@ div#test {
 </div>
 
 <script>
-let typeList = [];
-let pointerTypeList = [];
-let buttonList = [];
-let buttonsList = [];
-let pointerMovePosition = [];
-let pointerDownPosition = [];
-let pointerUpPosition = [];
-let pointerEnterPosition = [];
-let pointerLeavePosition = [];
+let pointerDownEvent;
+let pointerMoveEvent;
+let receivedPointerDown = false;
 
 async_test(t => {
   let test = document.getElementById("test");
-  var eventList = ['pointerover', 'pointerenter', 'pointermove', 'pointerdown', 'pointerup', 'pointerout', 'pointerleave'];
+  var eventList = ['pointermove', 'pointerdown'];
   for (eventType of eventList) {
     test.addEventListener(eventType, e => {
-      typeList.push(e.type);
-      pointerTypeList.push(e.pointerType);
-      buttonList.push(e.button);
-      buttonsList.push(e.buttons);
-      if (e.type == "pointermove")
-        pointerMovePosition.push([e.clientX, e.clientY].toString());
-      if (e.type == "pointerdown")
-        pointerDownPosition.push([e.clientX, e.clientY].toString());
-      if (e.type == "pointerup")
-        pointerUpPosition.push([e.clientX, e.clientY].toString());
-      if (e.type == "pointerenter")
-        pointerEnterPosition.push([e.clientX, e.clientY].toString());
-      if (e.type == "pointerleave")
-        pointerLeavePosition.push([e.clientX, e.clientY].toString());
+      if (e.type == 'pointerdown') {
+        receivedPointerDown = true;
+        pointerDownEvent = e;
+      }
+      if (e.type == 'pointermove' && receivedPointerDown)
+        pointerMoveEvent = e;
     });
   }
 
   let div = document.getElementById("test");
   let actions = new test_driver.Actions()
     .addPointer("penPointer1", "pen")
-    .pointerMove(0, 0)
-    .pointerMove(10, 10)
     .pointerMove(0, 0, {origin: test})
-    .pointerDown()
+    .pointerDown({pressure:0.36, tiltX:-72, tiltY:9, twist:86})
     .pointerMove(15, 0, {origin: test})
-    .pointerMove(30, 0, {origin: test})
     .pointerUp()
-    .pointerMove(0, 0)
     .send()
     .then(t.step_func_done(() => {
-      assert_array_equals(typeList, ["pointerover", "pointerenter",
-          "pointermove",  "pointermove", "pointerdown", "pointermove",
-          "pointermove", "pointerup", "pointerout", "pointerleave"]);
-      assert_array_equals(pointerTypeList, ["pen", "pen", "pen", "pen", "pen",
-          "pen", "pen", "pen", "pen", "pen"]);
-      assert_array_equals(buttonList, [-1, -1, -1, -1, 0, -1, -1, 0, -1, -1]);
-      assert_array_equals(buttonsList, [0, 0, 0, 0, 1, 1, 1, 0, 0, 0]);
-      assert_array_equals(pointerMovePosition, ["10,10", "55,55", "70,55", "85,55"]);
-      assert_array_equals(pointerDownPosition, ["55,55"]);
-      assert_array_equals(pointerUpPosition, ["85,55"]);
-      assert_array_equals(pointerEnterPosition, ["10,10"]);
-      assert_array_equals(pointerLeavePosition, ["0,0"]);
+      assert_equals(pointerDownEvent.type, "pointerdown");
+      assert_equals(pointerDownEvent.pointerType, "pen");
+      assert_equals(pointerDownEvent.width, 1);
+      assert_equals(pointerDownEvent.height, 1);
+      assert_equals(Math.round(pointerDownEvent.pressure * 100) / 100, 0.36);
+      assert_equals(pointerDownEvent.tiltX, -72);
+      assert_equals(pointerDownEvent.tiltY, 9);
+      assert_equals(pointerDownEvent.twist, 86);
+      assert_equals(pointerMoveEvent.type, "pointermove");
+      assert_equals(pointerMoveEvent.pointerType, "pen");
+      assert_equals(pointerMoveEvent.width, 1);
+      assert_equals(pointerMoveEvent.height, 1);
+      assert_equals(Math.round(pointerMoveEvent.pressure * 100) / 100, 0.5);
+      assert_equals(pointerMoveEvent.tiltX, 0);
+      assert_equals(pointerMoveEvent.tiltY, 0);
+      assert_equals(pointerMoveEvent.twist, 0);
   })).catch(e => t.step_func(() => assert_unreached("Actions sequence failed " + e)));
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/penPointerEvents.html b/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/penPointerEvents.html
new file mode 100644
index 00000000000..c5a2b1c06d9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/penPointerEvents.html
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>TestDriver actions: pointerevent properties of pen type</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+div#test {
+  position: fixed;
+  touch-action: none;
+  top: 5px;
+  left: 5px;
+  width: 100px;
+  height: 100px;
+  background-color: blue;
+}
+</style>
+
+<div id="test">
+</div>
+
+<script>
+let typeList = [];
+let pointerTypeList = [];
+let buttonList = [];
+let buttonsList = [];
+let pointerMovePosition = [];
+let pointerDownPosition = [];
+let pointerUpPosition = [];
+let pointerEnterPosition = [];
+let pointerLeavePosition = [];
+
+async_test(t => {
+  let test = document.getElementById("test");
+  var eventList = ['pointerover', 'pointerenter', 'pointermove', 'pointerdown', 'pointerup', 'pointerout', 'pointerleave'];
+  for (eventType of eventList) {
+    test.addEventListener(eventType, e => {
+      typeList.push(e.type);
+      pointerTypeList.push(e.pointerType);
+      buttonList.push(e.button);
+      buttonsList.push(e.buttons);
+      if (e.type == "pointermove")
+        pointerMovePosition.push([e.clientX, e.clientY].toString());
+      if (e.type == "pointerdown")
+        pointerDownPosition.push([e.clientX, e.clientY].toString());
+      if (e.type == "pointerup")
+        pointerUpPosition.push([e.clientX, e.clientY].toString());
+      if (e.type == "pointerenter")
+        pointerEnterPosition.push([e.clientX, e.clientY].toString());
+      if (e.type == "pointerleave")
+        pointerLeavePosition.push([e.clientX, e.clientY].toString());
+    });
+  }
+
+  let div = document.getElementById("test");
+  let actions = new test_driver.Actions()
+    .addPointer("penPointer1", "pen")
+    .pointerMove(0, 0)
+    .pointerMove(10, 10)
+    .pointerMove(0, 0, {origin: test})
+    .pointerDown()
+    .pointerMove(15, 0, {origin: test})
+    .pointerMove(30, 0, {origin: test})
+    .pointerUp()
+    .pointerMove(0, 0)
+    .send()
+    .then(t.step_func_done(() => {
+      assert_array_equals(typeList, ["pointerover", "pointerenter",
+          "pointermove",  "pointermove", "pointerdown", "pointermove",
+          "pointermove", "pointerup", "pointerout", "pointerleave"]);
+      assert_array_equals(pointerTypeList, ["pen", "pen", "pen", "pen", "pen",
+          "pen", "pen", "pen", "pen", "pen"]);
+      assert_array_equals(buttonList, [-1, -1, -1, -1, 0, -1, -1, 0, -1, -1]);
+      assert_array_equals(buttonsList, [0, 0, 0, 0, 1, 1, 1, 0, 0, 0]);
+      assert_array_equals(pointerMovePosition, ["10,10", "55,55", "70,55", "85,55"]);
+      assert_array_equals(pointerDownPosition, ["55,55"]);
+      assert_array_equals(pointerUpPosition, ["85,55"]);
+      assert_array_equals(pointerEnterPosition, ["10,10"]);
+      assert_array_equals(pointerLeavePosition, ["0,0"]);
+  })).catch(e => t.step_func(() => assert_unreached("Actions sequence failed " + e)));
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/pointerevent_pointermove_in_pointerlock.html.ini b/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/pointerevent_pointermove_in_pointerlock.html.ini
deleted file mode 100644
index 0c21bf5b526..00000000000
--- a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/pointerevent_pointermove_in_pointerlock.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[pointerevent_pointermove_in_pointerlock.html]
-  expected:
-    if product == "firefox": ERROR
diff --git a/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/touchPointerEventProperties.html b/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/touchPointerEventProperties.html
new file mode 100644
index 00000000000..b636dfde797
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/testdriver/actions/touchPointerEventProperties.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>TestDriver actions: pointerevent properties of touch type</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+div#test {
+  position: fixed;
+  touch-action: none;
+  top: 5px;
+  left: 5px;
+  width: 100px;
+  height: 100px;
+  background-color: blue;
+}
+</style>
+
+<div id="test">
+</div>
+
+<script>
+let pointerDownEvent;
+let pointerMoveEvent;
+let receivedPointerDown = false;
+
+async_test(t => {
+  let test = document.getElementById("test");
+  var eventList = ['pointermove', 'pointerdown'];
+  for (eventType of eventList) {
+    test.addEventListener(eventType, e => {
+      if (e.type == 'pointerdown') {
+        receivedPointerDown = true;
+        pointerDownEvent = e;
+      }
+      if (e.type == 'pointermove' && receivedPointerDown)
+        pointerMoveEvent = e;
+    });
+  }
+
+  let div = document.getElementById("test");
+  let actions = new test_driver.Actions()
+    .addPointer("touchPointer1", "touch")
+    .pointerMove(0, 0, {origin: test})
+    .pointerDown({width:23, height:31, pressure:0.78, tiltX:21, tiltY:-8, twist:355})
+    .pointerMove(15, 0, {origin: test, width:39, height:35, pressure:0.91, tiltX:-19, tiltY:62, twist:345})
+    .pointerUp()
+    .send()
+    .then(t.step_func_done(() => {
+      assert_equals(pointerDownEvent.type, "pointerdown");
+      assert_equals(pointerDownEvent.pointerType, "touch");
+      assert_equals(pointerDownEvent.width, 23);
+      assert_equals(pointerDownEvent.height, 31);
+      assert_equals(Math.round(pointerDownEvent.pressure * 100) / 100, 0.78);
+      assert_equals(pointerDownEvent.tiltX, 21);
+      assert_equals(pointerDownEvent.tiltY, -8);
+      assert_equals(pointerDownEvent.twist, 355);
+      assert_equals(pointerMoveEvent.type, "pointermove");
+      assert_equals(pointerMoveEvent.pointerType, "touch");
+      assert_equals(pointerMoveEvent.width, 39);
+      assert_equals(pointerMoveEvent.height, 35);
+      assert_equals(Math.round(pointerMoveEvent.pressure * 100) / 100, 0.91);
+      assert_equals(pointerMoveEvent.tiltX, -19);
+      assert_equals(pointerMoveEvent.tiltY, 62);
+      assert_equals(pointerMoveEvent.twist, 345);
+  })).catch(e => t.step_func(() => assert_unreached("Actions sequence failed " + e)));
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/infrastructure/testharness/lone-surrogates.html b/tests/wpt/web-platform-tests/infrastructure/testharness/lone-surrogates.html
new file mode 100644
index 00000000000..fb842ecc9e4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/testharness/lone-surrogates.html
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML>
+<title>test behaviour with lone surrogates</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  test(() => assert_true(true), "passing test with lone surrogate \uD800 in name");
+  test(() => assert_true(false), "failing test with lone surrogate \uD800 in name");
+  test(() => assert_true(true, "lone \uD800 surrogate"), "passing test with lone surrogate in assert");
+  test(() => assert_true(false, "lone \uD800 surrogate"), "failing test with lone surrogate in assert");
+</script>
diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-backspace.tentative.html b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-backspace.tentative.html
index 71db5e72878..bd2621d988f 100644
--- a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-backspace.tentative.html
+++ b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-backspace.tentative.html
@@ -12,11 +12,11 @@
 <script>
 "use strict";
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p>");
   gSelection.collapse(gEditor.firstChild.firstChild, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abc</p>");
+  checkEditorContentResultAsSubTest("<p>abc</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: gEditor.firstChild.firstChild,
     startOffset: 0,
@@ -27,11 +27,11 @@ promise_test(async () => {
 }, 'Backspace at "<p>[]abc</p>"');
 
 // Simply deletes the previous ASCII character of caret position.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p>");
   gSelection.collapse(gEditor.firstChild.firstChild, 1);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>bc</p>");
+  checkEditorContentResultAsSubTest("<p>bc</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: gEditor.firstChild.firstChild,
     startOffset: 0,
@@ -42,11 +42,11 @@ promise_test(async () => {
 }, 'Backspace at "<p>a[]bc</p>"');
 
 // Simply deletes the previous ASCII character of caret position.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p>");
   gSelection.collapse(gEditor.firstChild.firstChild, 2);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>ac</p>");
+  checkEditorContentResultAsSubTest("<p>ac</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: gEditor.firstChild.firstChild,
     startOffset: 1,
@@ -57,11 +57,11 @@ promise_test(async () => {
 }, 'Backspace at "<p>ab[]c</p>"');
 
 // Simply deletes the previous ASCII character of caret position.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p>");
   gSelection.collapse(gEditor.firstChild.firstChild, 3);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>ab</p>");
+  checkEditorContentResultAsSubTest("<p>ab</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: gEditor.firstChild.firstChild,
     startOffset: 2,
@@ -75,12 +75,12 @@ promise_test(async () => {
 // However, we need discussion whether the `<span>` element should be
 // contained by a range of `getTargetRanges()`.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>a<span>b</span>c</p>");
   let c = gEditor.querySelector("span").nextSibling;
   gSelection.collapse(c, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>ac</p>");
+  checkEditorContentResultAsSubTest("<p>ac</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: gEditor.firstChild,
     startOffset: 1,
@@ -94,12 +94,12 @@ promise_test(async () => {
 // However, we need discussion whether the `<span>` element should be
 // contained by a range of `getTargetRanges()`.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>a<span>b</span>c</p>");
   let b = gEditor.querySelector("span").firstChild;
   gSelection.collapse(b, 1);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>ac</p>");
+  checkEditorContentResultAsSubTest("<p>ac</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: gEditor.firstChild,
     startOffset: 1,
@@ -113,12 +113,17 @@ promise_test(async () => {
 // character is deleted.  If it's deleted, it should be contained by
 // the range of `getTargetRanges()`, but needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p> abc</p>");
   gSelection.collapse(gEditor.firstChild.firstChild, 2);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<p>bc</p>",
-                                      "<p> bc</p>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<p>bc</p>",
+      "<p> bc</p>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: gEditor.firstChild.firstChild,
     startOffset: gEditor.firstChild.firstChild.length == 2 ? 0 : 1,
@@ -128,7 +133,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p> a[]bc</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p><p>def</p>");
   let p1 = gEditor.firstChild;
   let abc = p1.firstChild;
@@ -136,7 +141,7 @@ promise_test(async () => {
   let def = p2.firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -151,7 +156,7 @@ promise_test(async () => {
 // becoming visible when the blocks are joined.  Perhaps, they should be
 // contained by the range of `getTargetRanges()`, but needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc   </p><p>   def</p>");
   let p1 = gEditor.firstChild;
   let abc = p1.firstChild;
@@ -159,7 +164,7 @@ promise_test(async () => {
   let def = p2.firstChild;
   gSelection.collapse(def, 3);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -174,7 +179,7 @@ promise_test(async () => {
 // becoming visible when the blocks are joined.  Perhaps, they should be
 // contained by the range of `getTargetRanges()`, but needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc   </p><p>   def</p>");
   let p1 = gEditor.firstChild;
   let abc = p1.firstChild;
@@ -182,7 +187,7 @@ promise_test(async () => {
   let def = p2.firstChild;
   gSelection.collapse(def, 2);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -197,7 +202,7 @@ promise_test(async () => {
 // becoming visible when the blocks are joined.  Perhaps, they should be
 // contained by the range of `getTargetRanges()`, but needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc   </p><p>   def</p>");
   let p1 = gEditor.firstChild;
   let abc = p1.firstChild;
@@ -205,7 +210,7 @@ promise_test(async () => {
   let def = p2.firstChild;
   gSelection.collapse(def, 1);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -220,7 +225,7 @@ promise_test(async () => {
 // becoming visible when the blocks are joined.  Perhaps, they should be
 // contained by the range of `getTargetRanges()`, but needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc   </p><p>   def</p>");
   let p1 = gEditor.firstChild;
   let abc = p1.firstChild;
@@ -228,7 +233,7 @@ promise_test(async () => {
   let def = p2.firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -238,13 +243,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc   </p><p>[]   def</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p><p><b>def</b></p>");
   let abc = gEditor.querySelector("p").firstChild;
   let def = gEditor.querySelector("b").firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abc<b>def</b></p>");
+  checkEditorContentResultAsSubTest("<p>abc<b>def</b></p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -254,14 +259,19 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc</p><p><b>[]def</b></p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p><b>abc</b></p><p><b>def</b></p>");
   let abc = gEditor.querySelector("p > b").firstChild;
   let def = gEditor.querySelector("P + p > b").firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<p><b>abc</b><b>def</b></p>",
-                                      "<p><b>abcdef</b></p>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<p><b>abc</b><b>def</b></p>",
+      "<p><b>abcdef</b></p>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -271,13 +281,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p><b>abc</b></p><p><b>[]def</b></p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p><i>abc</i></p><p><b>def</b></p>");
   let abc = gEditor.querySelector("i").firstChild;
   let def = gEditor.querySelector("b").firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p><i>abc</i><b>def</b></p>");
+  checkEditorContentResultAsSubTest("<p><i>abc</i><b>def</b></p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -293,7 +303,7 @@ promise_test(async () => {
 // deleted.  Perhaps, the invisible white-spaces should be contained by
 // the range of `getTargetRanges()`, but needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<pre>abc   </pre><p>   def</p>");
   let pre = gEditor.firstChild;
   let abc = pre.firstChild;
@@ -303,7 +313,7 @@ promise_test(async () => {
   await sendBackspaceKey();
   // https://github.com/w3c/input-events/issues/112
   // Shouldn't make the invisible white-spaces visible.
-  assert_equals(gEditor.innerHTML, "<pre>abc   def</pre>");
+  checkEditorContentResultAsSubTest("<pre>abc   def</pre>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 6,
@@ -322,7 +332,7 @@ promise_test(async () => {
 // by additional range of `getTargetRanges()` or not because of the
 // implementation cost and runtime cost.  Needs discuss.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<pre>abc   </pre><p>   def   </p>");
   let pre = gEditor.firstChild;
   let abc = pre.firstChild;
@@ -330,7 +340,7 @@ promise_test(async () => {
   let def = p.firstChild;
   gSelection.collapse(def, 3);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<pre>abc   def   </pre>");
+  checkEditorContentResultAsSubTest("<pre>abc   def   </pre>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 6,
@@ -347,7 +357,7 @@ promise_test(async () => {
 // be in the range of `getTargetRanges()`, but not so for the preformatted
 // visible leading white-spaces.  But needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc   </p><pre>   def</pre>");
   let p = gEditor.firstChild;
   let abc = p.firstChild;
@@ -355,10 +365,15 @@ promise_test(async () => {
   let def = pre.firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<p>abc &nbsp; def</p>",
-                                      "<p>abc&nbsp;&nbsp; def</p>",
-                                      "<p>abc&nbsp; &nbsp;def</p>",
-                                      "<p>abc &nbsp;&nbsp;def</p>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<p>abc &nbsp; def</p>",
+      "<p>abc&nbsp;&nbsp; def</p>",
+      "<p>abc&nbsp; &nbsp;def</p>",
+      "<p>abc &nbsp;&nbsp;def</p>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 6,
@@ -373,7 +388,7 @@ promise_test(async () => {
 // deleted and join the blocks.  Therefore, the target range should contain
 // the `<br>` element and block boundaries. But maybe needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc<br></p><p>def</p>");
   let p1 = gEditor.firstChild;
   let abc = p1.firstChild;
@@ -381,7 +396,7 @@ promise_test(async () => {
   let def = p2.firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p1,
     startOffset: 1,
@@ -396,7 +411,7 @@ promise_test(async () => {
 // should be deleted and join the blocks.  Therefore, the target range should
 // contain the `<br>` element and block boundaries. But maybe needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc<br><br></p><p>def</p>");
   let p1 = gEditor.firstChild;
   let abc = p1.firstChild;
@@ -404,7 +419,7 @@ promise_test(async () => {
   let def = p2.firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abc<br>def</p>");
+  checkEditorContentResultAsSubTest("<p>abc<br>def</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p1,
     startOffset: 2,
@@ -416,13 +431,13 @@ promise_test(async () => {
 
 // Deleting visible `<br>` element should be contained by a range of
 // `getTargetRanges()`.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc<br>def</p>");
   let p = document.querySelector("p");
   let def = gEditor.querySelector("br").nextSibling;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -434,13 +449,13 @@ promise_test(async () => {
 
 // Deleting visible `<br>` element following white-space should not include
 // the preceding white-space in the range.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc <br>def</p>");
   let p = gEditor.querySelector("p");
   let def = gEditor.querySelector("br").nextSibling;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abc def</p>");
+  checkEditorContentResultAsSubTest("<p>abc def</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -450,13 +465,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc <br>[]def</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<p>abc<img src="${kImgSrc}">def</p>`);
   let p = gEditor.querySelector("p");
   let def = p.lastChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -468,13 +483,13 @@ promise_test(async () => {
 
 // White-spaces around `<img>` element are visible so that they shouldn't
 // be included into the target ranges.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<p>abc <img src="${kImgSrc}">def</p>`);
   let p = gEditor.querySelector("p");
   let def = p.lastChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abc def</p>");
+  checkEditorContentResultAsSubTest("<p>abc def</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -486,13 +501,13 @@ promise_test(async () => {
 
 // White-spaces around `<img>` element are visible so that they shouldn't
 // be included into the target ranges.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<p>abc<img src="${kImgSrc}"> def</p>`);
   let p = gEditor.querySelector("p");
   let def = p.lastChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abc def</p>");
+  checkEditorContentResultAsSubTest("<p>abc def</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -502,13 +517,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc<img>[] def</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<p>abc<img src="${kImgSrc}"><img src="${kImgSrc}">def</p>`);
   let p = gEditor.querySelector("p");
   let abc = p.firstChild;
   gSelection.collapse(p, 2);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, `<p>abc<img src="${kImgSrc}">def</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>abc<img src="${kImgSrc}">def</p>`,
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -518,13 +536,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc<img>{}<img>def</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<p>abc<img src="${kImgSrc}"><img src="${kImgSrc}">def</p>`);
   let p = gEditor.querySelector("p");
   let def = p.lastChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, `<p>abc<img src="${kImgSrc}">def</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>abc<img src="${kImgSrc}">def</p>`,
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 2,
@@ -534,14 +555,14 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc<img><img>[]def</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<div>abc<hr>def</div>`);
   let div = gEditor.querySelector("div");
   let hr = gEditor.querySelector("hr");
   let def = hr.nextSibling;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<div>abcdef</div>");
+  checkEditorContentResultAsSubTest("<div>abcdef</div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: div,
     startOffset: 1,
@@ -555,7 +576,7 @@ promise_test(async () => {
 // they should be included into the target ranges to avoid they bcome
 // visible.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<div>abc <hr>def</div>`);
   let div = gEditor.querySelector("div");
   let abc = div.firstChild;
@@ -563,7 +584,7 @@ promise_test(async () => {
   let def = hr.nextSibling;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<div>abcdef</div>");
+  checkEditorContentResultAsSubTest("<div>abcdef</div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -577,14 +598,14 @@ promise_test(async () => {
 // they should be included into the target ranges to avoid they bcome
 // visible.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<div>abc<hr> def</div>`);
   let div = gEditor.querySelector("div");
   let hr = gEditor.querySelector("hr");
   let def = hr.nextSibling;
   gSelection.collapse(def, 1);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<div>abcdef</div>");
+  checkEditorContentResultAsSubTest("<div>abcdef</div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: div,
     startOffset: 1,
@@ -596,13 +617,13 @@ promise_test(async () => {
 
 // Invisible `<br>` element immediately before `<hr>` element should be
 // deleted once, and both of them should be included in the target range.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<div>abc<br><hr>def</div>`);
   let div = gEditor.querySelector("div");
   let def = div.lastChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<div>abcdef</div>");
+  checkEditorContentResultAsSubTest("<div>abcdef</div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: div,
     startOffset: 1,
@@ -616,13 +637,13 @@ promise_test(async () => {
 // the following white-space in the range because it shouldn't become
 // visible and should be deleted for avoiding it.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc<br> def</p>");
   let p = gEditor.querySelector("p");
   let def = gEditor.querySelector("br").nextSibling;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -631,13 +652,13 @@ promise_test(async () => {
   });
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc<br>[] def</p>"');
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc<br> def</p>");
   let p = gEditor.querySelector("p");
   let def = gEditor.querySelector("br").nextSibling;
   gSelection.collapse(def, 1);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -647,15 +668,20 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc<br> []def</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<p>def<br>ghi</p></div>");
   let p = gEditor.querySelector("p");
   let def = p.firstChild;
   let abc = gEditor.firstChild.firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<div>abcdef<p>ghi</p></div>",
-                                      "<div>abcdef<br><p>ghi</p></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div>abcdef<p>ghi</p></div>",
+      "<div>abcdef<br><p>ghi</p></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -670,15 +696,20 @@ promise_test(async () => {
 // the child block, and they should be contained in a range of
 // `getTargetRanges()`, but maybe needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc   <p>   def<br>ghi</p></div>");
   let p = gEditor.querySelector("p");
   let def = p.firstChild;
   let abc = gEditor.firstChild.firstChild;
   gSelection.collapse(def, 3);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<div>abcdef<p>ghi</p></div>",
-                                      "<div>abcdef<br><p>ghi</p></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div>abcdef<p>ghi</p></div>",
+      "<div>abcdef<br><p>ghi</p></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -688,13 +719,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div>abc   <p>   []def<br>ghi</p></div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<p><b>def</b></p></div>");
   let abc = gEditor.querySelector("div").firstChild;
   let def = gEditor.querySelector("b").firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<div>abc<b>def</b></div>");
+  checkEditorContentResultAsSubTest("<div>abc<b>def</b></div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -704,14 +735,19 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div>abc<p><b>[]def</b></p></div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><b>abc</b><p><b>def</b></p></div>");
   let abc = gEditor.querySelector("b").firstChild;
   let def = gEditor.querySelector("p > b").firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<div><b>abc</b><b>def</b></div>",
-                                      "<div><b>abcdef</b></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div><b>abc</b><b>def</b></div>",
+      "<div><b>abcdef</b></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -721,13 +757,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div><b>abc</b><p><b>[]def</b></p></div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><i>abc</i><p><b>def</b></p></div>");
   let abc = gEditor.querySelector("i").firstChild;
   let def = gEditor.querySelector("b").firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<div><i>abc</i><b>def</b></div>");
+  checkEditorContentResultAsSubTest("<div><i>abc</i><b>def</b></div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -737,14 +773,19 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div><i>abc</i><p><b>[]def</b></p></div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><p>abc</p>def</div>");
   let abc = gEditor.querySelector("p").firstChild;
   let def = gEditor.querySelector("p").nextSibling;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<div><p>abcdef</p></div>",
-                                      "<div><p>abcdef<br></p></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div><p>abcdef</p></div>",
+      "<div><p>abcdef<br></p></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -759,14 +800,19 @@ promise_test(async () => {
 // in the parent block, and they should be contained by a range of
 // `getTargetRanges()`, but maybe needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><p>abc   </p>   def</div>");
   let abc = gEditor.querySelector("p").firstChild;
   let def = gEditor.querySelector("p").nextSibling;
   gSelection.collapse(def, 3);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<div><p>abcdef</p></div>",
-                                      "<div><p>abcdef<br></p></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div><p>abcdef</p></div>",
+      "<div><p>abcdef<br></p></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -776,13 +822,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div><p>abc   </p>   []def</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><p><b>abc</b></p>def</div>");
   let abc = gEditor.querySelector("b").firstChild;
   let def = gEditor.querySelector("p").nextSibling;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<div><p><b>abc</b>def</p></div>");
+  checkEditorContentResultAsSubTest("<div><p><b>abc</b>def</p></div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -792,14 +838,19 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div><p><b>abc</b></p>[]def</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><p><b>abc</b></p><b>def</b></div>");
   let abc = gEditor.querySelector("b").firstChild;
   let def = gEditor.querySelector("div > b").firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<div><p><b>abc</b><b>def</b></p></div>",
-                                      "<div><p><b>abcdef</b></p></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div><p><b>abc</b><b>def</b></p></div>",
+      "<div><p><b>abcdef</b></p></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -809,13 +860,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div><p><b>abc</b></p><b>[]def</b></div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><p><b>abc</b></p><i>def</i></div>");
   let abc = gEditor.querySelector("b").firstChild;
   let def = gEditor.querySelector("i").firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<div><p><b>abc</b><i>def</i></p></div>");
+  checkEditorContentResultAsSubTest(
+    "<div><p><b>abc</b><i>def</i></p></div>",
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -825,13 +879,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div><p><b>abc</b></p><i>[]def</i></div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li></ul>ghi</div>");
   let abc = gEditor.querySelector("div").firstChild;
   let def = gEditor.querySelector("li").firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<div>abcdefghi</div>");
+  checkEditorContentResultAsSubTest("<div>abcdefghi</div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -841,13 +895,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div>abc<ul><li>[]def</li></ul>ghi</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc  <ul><li> def </li></ul>  ghi</div>");
   let abc = gEditor.querySelector("div").firstChild;
   let def = gEditor.querySelector("li").firstChild;
   gSelection.collapse(def, 1);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<div>abcdefghi</div>");
+  checkEditorContentResultAsSubTest("<div>abcdefghi</div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -857,13 +911,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div>abc  <ul><li> []def </li></ul>  ghi</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc  <ul><li> def </li></ul>  ghi</div>");
   let abc = gEditor.querySelector("div").firstChild;
   let def = gEditor.querySelector("li").firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<div>abcdefghi</div>");
+  checkEditorContentResultAsSubTest("<div>abcdefghi</div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -873,13 +927,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div>abc  <ul><li>[] def </li></ul>  ghi</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li></ul>ghi</div>");
   let def = gEditor.querySelector("li").firstChild;
   let ghi = gEditor.querySelector("ul").nextSibling;
   gSelection.collapse(ghi, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<div>abc<ul><li>defghi</li></ul></div>");
+  checkEditorContentResultAsSubTest(
+    "<div>abc<ul><li>defghi</li></ul></div>",
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: def,
     startOffset: 3,
@@ -889,15 +946,20 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div>abc<ul><li>def</li></ul>[]ghi</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc <ul><li>  def  </li></ul> ghi</div>");
   let def = gEditor.querySelector("li").firstChild;
   let ghi = gEditor.querySelector("ul").nextSibling;
   gSelection.collapse(ghi, 1);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<div>abc <ul><li>  defghi</li></ul></div>",
-                                      "<div>abc <ul><li>defghi</li></ul></div>",
-                                      "<div>abc<ul><li>defghi</li></ul></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div>abc <ul><li>  defghi</li></ul></div>",
+      "<div>abc <ul><li>defghi</li></ul></div>",
+      "<div>abc<ul><li>defghi</li></ul></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: def,
     startOffset: 5,
@@ -907,15 +969,20 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div>abc <ul><li>  def  </li></ul> []ghi</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc <ul><li>  def  </li></ul> ghi</div>");
   let def = gEditor.querySelector("li").firstChild;
   let ghi = gEditor.querySelector("ul").nextSibling;
   gSelection.collapse(ghi, 0);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<div>abc <ul><li>  defghi</li></ul></div>",
-                                      "<div>abc <ul><li>defghi</li></ul></div>",
-                                      "<div>abc<ul><li>defghi</li></ul></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div>abc <ul><li>  defghi</li></ul></div>",
+      "<div>abc <ul><li>defghi</li></ul></div>",
+      "<div>abc<ul><li>defghi</li></ul></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: def,
     startOffset: 5,
@@ -925,13 +992,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div>abc <ul><li>  def  </li></ul>[] ghi</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li><li>ghi</li></ul>jkl</div>");
   let abc = gEditor.querySelector("div").firstChild;
   let def = gEditor.querySelector("li").firstChild;
   gSelection.collapse(def, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<div>abcdef<ul><li>ghi</li></ul>jkl</div>");
+  checkEditorContentResultAsSubTest(
+    "<div>abcdef<ul><li>ghi</li></ul>jkl</div>",
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -941,13 +1011,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div>abc<ul><li>[]def</li><li>ghi</li></ul>jkl</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li><li>ghi</li></ul>jkl</div>");
   let def = gEditor.querySelector("li").firstChild;
   let ghi = gEditor.querySelector("li + li").firstChild;
   gSelection.collapse(ghi, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<div>abc<ul><li>defghi</li></ul>jkl</div>");
+  checkEditorContentResultAsSubTest(
+    "<div>abc<ul><li>defghi</li></ul>jkl</div>",
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: def,
     startOffset: 3,
@@ -957,13 +1030,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<div>abc<ul><li>def</li><li>[]ghi</li></ul>jkl</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li><li>ghi</li></ul>jkl</div>");
   let ghi = gEditor.querySelector("li + li").firstChild;
   let jkl = gEditor.querySelector("ul").nextSibling;
   gSelection.collapse(jkl, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<div>abc<ul><li>def</li><li>ghijkl</li></ul></div>");
+  assert_equals(gEditor.innerHTML,
+    "<div>abc<ul><li>def</li><li>ghijkl</li></ul></div>",
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: ghi,
     startOffset: 3,
@@ -977,14 +1053,14 @@ promise_test(async () => {
 // case, it should be treated as joining with the previous paragraph.
 // The target range should include the invisible <br> element in the empty
 // paragraph.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p><p><br></p>");
   let p1 = gEditor.querySelector("p");
   let abc = p1.firstChild;
   let p2 = p1.nextSibling;
   gSelection.collapse(p2, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abc</p>");
+  checkEditorContentResultAsSubTest("<p>abc</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -996,7 +1072,7 @@ promise_test(async () => {
 
 // Delete ignore the empty span and the other things must be same as the
 // previous test.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p><p><span></span><br></p>");
   let p1 = gEditor.querySelector("p");
   let abc = p1.firstChild;
@@ -1004,7 +1080,7 @@ promise_test(async () => {
   let span = p2.firstChild;
   gSelection.collapse(span, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abc</p>");
+  checkEditorContentResultAsSubTest("<p>abc</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -1016,15 +1092,20 @@ promise_test(async () => {
 
 // If invisible white-spaces are removed with same action as above tests,
 // the range should be included in the target ranges.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc  </p><p><br></p>");
   let p1 = gEditor.querySelector("p");
   let abc = p1.firstChild;
   let p2 = p1.nextSibling;
   gSelection.collapse(p2, 0);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<p>abc  </p>",
-                                      "<p>abc</p>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<p>abc  </p>",
+      "<p>abc</p>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: abc.length,
@@ -1036,14 +1117,17 @@ promise_test(async () => {
 
 // If the previous block ends with non-editable content, target range
 // should be after the non-editable content node.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc<span contenteditable=\"false\">def</span></p><p><br></p>");
   let p1 = gEditor.querySelector("p");
   let span = gEditor.querySelector("span");
   let p2 = p1.nextSibling;
   gSelection.collapse(p2, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abc<span contenteditable=\"false\">def</span></p>");
+  checkEditorContentResultAsSubTest(
+    "<p>abc<span contenteditable=\"false\">def</span></p>",
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p1,
     startOffset: 2,
@@ -1056,7 +1140,7 @@ promise_test(async () => {
 // If previous non-editable paragraph is deleted, target range should begin
 // with end of the text node in the first paragraph.  Otherwise, start from
 // after the non-editable paragraph.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p><p contenteditable=\"false\">def</p><p><br></p>");
   let p1 = gEditor.querySelector("p");
   let abc = p1.firstChild;
@@ -1064,8 +1148,13 @@ promise_test(async () => {
   let p3 = p2.nextSibling;
   gSelection.collapse(p3, 0);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<p>abc</p>",
-                                      "<p>abc</p><p contenteditable=\"false\">def</p>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<p>abc</p>",
+      "<p>abc</p><p contenteditable=\"false\">def</p>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p2.isConnected ? gEditor : abc,
     startOffset: p2.isConnected ? 2 : abc.length,
@@ -1075,15 +1164,20 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<p>abc</p><p contenteditable=\"false\">def</p><p>{}<br></p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc<span contenteditable=\"false\">def</span>ghi</p>");
   let p = gEditor.querySelector("p");
   let ghi = p.lastChild;
   gSelection.collapse(ghi, 0);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<p>abc<span contenteditable=\"false\">def</span>ghi</p>",
-                                      "<p>abcghi</p>",
-                                      "<p>abcghi<br></p>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<p>abc<span contenteditable=\"false\">def</span>ghi</p>",
+      "<p>abcghi</p>",
+      "<p>abcghi<br></p>",
+    ],
+    t.name
+  );
   if (gEditor.innerHTML === "<p>abc<span contenteditable=\"false\">def</span>ghi</p>") {
     checkGetTargetRangesOfBeforeinputOnDeleteSomething({
       startContainer: ghi,
@@ -1107,14 +1201,19 @@ promise_test(async () => {
 
 // If just removes the paragraph, target range should start from after the
 // table element.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell</td></tr></table><p><br></p>");
   let table = gEditor.querySelector("table");
   let p = table.nextSibling;
   gSelection.collapse(p, 0);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td>cell</td></tr></tbody></table>",
-                                      "<table><tbody><tr><td>cell</td></tr></tbody></table><p><br></p>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td>cell</td></tr></tbody></table>",
+      "<table><tbody><tr><td>cell</td></tr></tbody></table><p><br></p>",
+    ],
+    t.name
+  );
   if (p.isConnected) {
     checkGetTargetRangesOfBeforeinputOnDeleteSomething({
       startContainer: p,
@@ -1136,13 +1235,16 @@ promise_test(async () => {
 
 // If table cell won't be joined, target range should be collapsed in the
 // cell.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td><br></td></tr></table>");
   let cell1 = gEditor.querySelector("td");
   let cell2 = cell1.nextSibling;
   gSelection.collapse(cell2, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<table><tbody><tr><td>cell1</td><td><br></td></tr></tbody></table>");
+  assert_equals(gEditor.innerHTML,
+    "<table><tbody><tr><td>cell1</td><td><br></td></tr></tbody></table>",
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: cell2,
     startOffset: 0,
@@ -1154,12 +1256,15 @@ promise_test(async () => {
 
 // If table caption won't be deleted, target range should be collapsed in the
 // caption element.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p><table><caption><br></caption><tr><td>cell</td></tr></table>");
   let caption = gEditor.querySelector("caption");
   gSelection.collapse(caption, 0);
   await sendBackspaceKey();
-  assert_equals(gEditor.innerHTML, "<p>abc</p><table><caption><br></caption><tbody><tr><td>cell</td></tr></tbody></table>");
+  assert_equals(gEditor.innerHTML,
+    "<p>abc</p><table><caption><br></caption><tbody><tr><td>cell</td></tr></tbody></table>",
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: caption,
     startOffset: 0,
@@ -1170,14 +1275,19 @@ promise_test(async () => {
 }, 'Backspace at "<p>abc</p><table><caption>{}<br></caption><tr><td>cell</td></tr></table>"');
 
 // If a table cell element is selected, only its content should be deleted.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr></table>");
   let cell1 = gEditor.querySelector("td");
   let tr = cell1.parentNode;
   gSelection.setBaseAndExtent(tr, 0, tr, 1);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td><td>cell2</td></tr></tbody></table>",
-                                      "<table><tbody><tr><td><br></td><td>cell2</td></tr></tbody></table>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td></td><td>cell2</td></tr></tbody></table>",
+      "<table><tbody><tr><td><br></td><td>cell2</td></tr></tbody></table>",
+    ],
+    t.name
+  );
   // XXX Perhaps, target range should be selecting only all children of
   //     cell1 instead.
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
@@ -1189,14 +1299,19 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<table><tr>{<td>cell1</td>}<td>cell2</td></tr></table>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr></table>");
   let cell2 = gEditor.querySelector("td + td");
   let tr = cell2.parentNode;
   gSelection.setBaseAndExtent(tr, 1, tr, 2);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td>cell1</td><td></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td>cell1</td><td><br></td></tr></tbody></table>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td>cell1</td><td></td></tr></tbody></table>",
+      "<table><tbody><tr><td>cell1</td><td><br></td></tr></tbody></table>",
+    ],
+    t.name
+  );
   // XXX Perhaps, target range should be selecting only all children of
   //     cell1 instead.
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
@@ -1209,16 +1324,21 @@ promise_test(async () => {
 }, 'Backspace at "<table><tr><td>cell1</td>{<td>cell2</td>}</tr></table>"');
 
 // If the last table cell element is selected, what browsers should do?
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell</td></tr></table>");
   let cell = gEditor.querySelector("td");
   let tr = cell.parentNode;
   let table = gEditor.querySelector("table");
   gSelection.setBaseAndExtent(tr, 0, tr, 1);
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td><br></td></tr></tbody></table>",
-                                      "<br>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td></td></tr></tbody></table>",
+      "<table><tbody><tr><td><br></td></tr></tbody></table>",
+      "<br>",
+    ],
+    t.name
+  );
   if (gEditor.querySelector("table")) {
     // XXX Perhaps, target range should be selecting only all children of
     //     cell1 instead.
@@ -1242,7 +1362,7 @@ promise_test(async () => {
 }, 'Backspace at "<table><tr>{<td>cell</td>}</tr></table>"');
 
 // Testing multiple cell selection mode.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr><tr><td>cell3</td><td>cell4</td></tr></table>");
   let cell1 = gEditor.querySelector("td");
   let cell4 = gEditor.querySelector("tr + tr > td + td");
@@ -1257,8 +1377,13 @@ promise_test(async () => {
   gSelection.addRange(range);
   assert_equals(gSelection.rangeCount, 2, "Should support multiple cell selection");
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td><td>cell2</td></tr><tr><td>cell3</td><td></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td><br></td><td>cell2</td></tr><tr><td>cell3</td><td><br></td></tr></tbody></table>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td></td><td>cell2</td></tr><tr><td>cell3</td><td></td></tr></tbody></table>",
+      "<table><tbody><tr><td><br></td><td>cell2</td></tr><tr><td>cell3</td><td><br></td></tr></tbody></table>",
+    ],
+    t.name
+  );
   // XXX Perhaps, target range should be selecting only all children of
   //     cell1 and cell4 instead.
   checkGetTargetRangesOfBeforeinputOnDeleteSomething([
@@ -1278,7 +1403,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<table><tr>{<td>cell1</td>}<td>cell2</td></tr><tr><td>cell3</td>{<td>cell4</td>}</tr></table>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr><tr><td>cell3</td><td>cell4</td></tr></table>");
   let cell1 = gEditor.querySelector("td");
   let cell3 = gEditor.querySelector("tr + tr > td");
@@ -1293,9 +1418,14 @@ promise_test(async () => {
   gSelection.addRange(range);
   assert_equals(gSelection.rangeCount, 2, "Should support multiple cell selection");
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td><td>cell2</td></tr><tr><td></td><td>cell4</td></tr></tbody></table>",
-                                      "<table><tbody><tr><td><br></td><td>cell2</td></tr><tr><td><br></td><td>cell4</td></tr></tbody></table>",
-                                      "<table><tbody><tr><td>cell2</td></tr><tr><td>cell4</td></tr></tbody></table>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td></td><td>cell2</td></tr><tr><td></td><td>cell4</td></tr></tbody></table>",
+      "<table><tbody><tr><td><br></td><td>cell2</td></tr><tr><td><br></td><td>cell4</td></tr></tbody></table>",
+      "<table><tbody><tr><td>cell2</td></tr><tr><td>cell4</td></tr></tbody></table>",
+    ],
+    t.name
+  );
   // XXX Perhaps, target range should be selecting only all children of
   //     cell1 and cell3 instead.
   checkGetTargetRangesOfBeforeinputOnDeleteSomething([
@@ -1315,7 +1445,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<table><tr>{<td>cell1</td>}<td>cell2</td></tr><tr>{<td>cell3</td>}<td>cell4</td></tr></table>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr><tr><td>cell3</td><td>cell4</td></tr></table>");
   let cell1 = gEditor.querySelector("td");
   let cell2 = gEditor.querySelector("td + td");
@@ -1330,9 +1460,14 @@ promise_test(async () => {
   gSelection.addRange(range);
   assert_equals(gSelection.rangeCount, 2, "Should support multiple cell selection");
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td><td></td></tr><tr><td>cell3</td><td>cell4</td></tr></tbody></table>",
-                                      "<table><tbody><tr><td><br></td><td><br></td></tr><tr><td>cell3</td><td>cell4</td></tr></tbody></table>",
-                                      "<table><tbody><tr><td>cell3</td><td>cell4</td></tr></tbody></table>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td></td><td></td></tr><tr><td>cell3</td><td>cell4</td></tr></tbody></table>",
+      "<table><tbody><tr><td><br></td><td><br></td></tr><tr><td>cell3</td><td>cell4</td></tr></tbody></table>",
+      "<table><tbody><tr><td>cell3</td><td>cell4</td></tr></tbody></table>",
+    ],
+    t.name
+  );
   if (gEditor.querySelector("tr + tr")) {
     // XXX Perhaps, target range should be selecting only all children of
     //     cell1 and cell2 instead.
@@ -1361,7 +1496,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<table><tr>{<td>cell1</td>}{<td>cell2</td>}</tr><tr><td>cell3</td><td>cell4</td></tr></table>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr><tr><td>cell3</td><td>cell4</td></tr></table>");
   let cell3 = gEditor.querySelector("tr + tr > td");
   let cell4 = gEditor.querySelector("tr + tr > td + td");
@@ -1375,9 +1510,14 @@ promise_test(async () => {
   gSelection.addRange(range);
   assert_equals(gSelection.rangeCount, 2, "Should support multiple cell selection");
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td>cell1</td><td>cell2</td></tr><tr><td></td><td></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td>cell1</td><td>cell2</td></tr><tr><td><br></td><td><br></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td>cell1</td><td>cell2</td></tr></tbody></table>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td>cell1</td><td>cell2</td></tr><tr><td></td><td></td></tr></tbody></table>",
+      "<table><tbody><tr><td>cell1</td><td>cell2</td></tr><tr><td><br></td><td><br></td></tr></tbody></table>",
+      "<table><tbody><tr><td>cell1</td><td>cell2</td></tr></tbody></table>",
+    ],
+    t.name
+  );
   if (gEditor.querySelector("tr + tr")) {
     // XXX Perhaps, target range should be selecting only all children of
     //     cell3 and cell4 instead.
@@ -1406,7 +1546,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<table><tr><td>cell1</td><td>cell2</td></tr><tr>{<td>cell3</td>}{<td>cell4</td>}</tr></table>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr><tr><td>cell3</td><td>cell4</td></tr></table>");
   let cell1 = gEditor.querySelector("td");
   let cell2 = gEditor.querySelector("td + td");
@@ -1429,9 +1569,14 @@ promise_test(async () => {
   gSelection.addRange(range);
   assert_equals(gSelection.rangeCount, 4, "Should support multiple cell selection");
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td><td></td></tr><tr><td></td><td></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td></tr></tbody></table>",
-                                      "<br>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td></td><td></td></tr><tr><td></td><td></td></tr></tbody></table>",
+      "<table><tbody><tr><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td></tr></tbody></table>",
+      "<br>",
+    ],
+    t.name
+  );
   if (gEditor.querySelector("table")) {
     // XXX Perhaps, target range should be selecting only all children of
     //     cell1, cell2, cell3 and cell4 instead.
@@ -1472,7 +1617,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Backspace at "<table><tr>{<td>cell1</td>}{<td>cell2</td>}</tr><tr>{<td>cell3</td>}{<td>cell4</td>}</tr></table>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr><tr><td>cell3</td><td>cell4</td></tr></table>");
   let cell1 = gEditor.querySelector("td");
   let cell2 = gEditor.querySelector("td + td");
@@ -1492,10 +1637,15 @@ promise_test(async () => {
   gSelection.addRange(range);
   assert_equals(gSelection.rangeCount, 3, "Should support multiple cell selection");
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td><td>cell2</td></tr><tr><td>cell3</td><td></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td><br></td><td>cell2</td></tr><tr><td>cell3</td><td><br></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td></td><td>c2</td></tr><tr><td>cell3</td><td></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td><br></td><td>c2</td></tr><tr><td>cell3</td><td><br></td></tr></tbody></table>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td></td><td>cell2</td></tr><tr><td>cell3</td><td></td></tr></tbody></table>",
+      "<table><tbody><tr><td><br></td><td>cell2</td></tr><tr><td>cell3</td><td><br></td></tr></tbody></table>",
+      "<table><tbody><tr><td></td><td>c2</td></tr><tr><td>cell3</td><td></td></tr></tbody></table>",
+      "<table><tbody><tr><td><br></td><td>c2</td></tr><tr><td>cell3</td><td><br></td></tr></tbody></table>",
+    ],
+    t.name
+  );
   if (cell2.firstChild.length == "cell2".length) {
     // XXX Perhaps, target range should be selecting only all children of
     //     cell1 and cell4 instead.
@@ -1540,16 +1690,21 @@ promise_test(async () => {
 
 // If caret is not adjacent of deleting character, browser may not delete the
 // character, but update the caret position for next deletion.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>&#x5E9;&#x5DC;&#x5D5;&#x5DD;hello</p>");
   let text1 = gEditor.querySelector("p").firstChild;
   let text2 = text1.nextSibling;
   gSelection.collapse(text2 ? text2 : text1, text2 ? 1 : 5);
   await sendArrowLeftKey();
   await sendBackspaceKey();
-  assert_in_array(gEditor.innerHTML, ["<p>\u05E9\u05DC\u05D5\u05DDhello</p>",
-                                      "<p>\u05DC\u05D5\u05DDhello</p>",
-                                      "<p>\u05E9\u05DC\u05D5hello</p>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<p>\u05E9\u05DC\u05D5\u05DDhello</p>",
+      "<p>\u05DC\u05D5\u05DDhello</p>",
+      "<p>\u05E9\u05DC\u05D5hello</p>",
+    ],
+    t.name
+  );
   if (gEditor.innerHTML === "<p>\u05E9\u05DC\u05D5\u05DDhello</p>") {
     checkGetTargetRangesOfBeforeinputOnDeleteSomething({
       startContainer: text2 ? text2 : text1,
@@ -1593,7 +1748,7 @@ function getFirstDifferentOffset(currentString, originalString) {
   return currentString.length;
 }
 
-promise_test(async () => {
+promise_test(async (t) => {
   const kText = "abc def ghi";
   initializeTest(`<p>${kText}</p>`);
   let p = gEditor.querySelector("p");
@@ -1601,8 +1756,11 @@ promise_test(async () => {
   await sendBackspaceKey(kShift);
   let startOffset = getFirstDifferentOffset(p.firstChild.data, kText);
   let length = kText.length - p.firstChild.data.length;
-  assert_equals(gEditor.innerHTML.replace(/&nbsp;/g, " "),
-      `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`,
+    t.name,
+    { ignoreWhiteSpaceDifference: true }
+  );
   if (startOffset === kText.length) {
     checkBeforeinputAndInputEventsOnNOOP();
     return;
@@ -1616,7 +1774,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Shift + Backspace at "<p>abc def[] ghi</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   const kText = "abc def ghi";
   initializeTest(`<p>${kText}</p>`);
   let p = gEditor.querySelector("p");
@@ -1624,8 +1782,11 @@ promise_test(async () => {
   await sendBackspaceKey(kControl);
   let startOffset = getFirstDifferentOffset(p.firstChild.data, kText);
   let length = kText.length - p.firstChild.data.length;
-  assert_equals(gEditor.innerHTML.replace(/&nbsp;/g, " "),
-      `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`,
+    t.name,
+    { ignoreWhiteSpaceDifference: true }
+  );
   if (startOffset === kText.length) {
     checkBeforeinputAndInputEventsOnNOOP();
     return;
@@ -1639,7 +1800,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Control + Backspace at "<p>abc def[] ghi</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   const kText = "abc def ghi";
   initializeTest(`<p>${kText}</p>`);
   let p = gEditor.querySelector("p");
@@ -1647,8 +1808,11 @@ promise_test(async () => {
   await sendBackspaceKey(kAlt);
   let startOffset = getFirstDifferentOffset(p.firstChild.data, kText);
   let length = kText.length - p.firstChild.data.length;
-  assert_equals(gEditor.innerHTML.replace(/&nbsp;/g, " "),
-      `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`,
+    t.name,
+    { ignoreWhiteSpaceDifference: true }
+  );
   if (startOffset === kText.length) {
     checkBeforeinputAndInputEventsOnNOOP();
     return;
@@ -1662,7 +1826,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Alt + Backspace at "<p>abc def[] ghi</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   const kText = "abc def ghi";
   initializeTest(`<p>${kText}</p>`);
   let p = gEditor.querySelector("p");
@@ -1670,8 +1834,11 @@ promise_test(async () => {
   await sendBackspaceKey(kMeta);
   let startOffset = getFirstDifferentOffset(p.firstChild.data, kText);
   let length = kText.length - p.firstChild.data.length;
-  assert_equals(gEditor.innerHTML.replace(/&nbsp;/g, " "),
-      `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`,
+    t.name,
+    { ignoreWhiteSpaceDifference: true }
+  );
   if (startOffset === kText.length) {
     checkBeforeinputAndInputEventsOnNOOP();
     return;
@@ -1685,7 +1852,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Meta + Backspace at "<p>abc def[] ghi</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   const kText = "abc def";
   initializeTest(`<p>   ${kText}</p>`);
   let p = gEditor.querySelector("p");
@@ -1696,8 +1863,11 @@ promise_test(async () => {
   let startOffset = invisibleWhiteSpaces.length + getFirstDifferentOffset(visibleText, kText);
   let length = kText.length + 3 - p.firstChild.data.length;
   // If invisible white-spaces are deleted, they should be contained in the target range.
-  assert_equals(gEditor.innerHTML.replace(/&nbsp;/g, " "),
-      `<p>${invisibleWhiteSpaces + kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${invisibleWhiteSpaces + kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`,
+    t.name,
+    { ignoreWhiteSpaceDifference: true }
+  );
   if (startOffset === kText.length) {
     checkBeforeinputAndInputEventsOnNOOP();
     return;
@@ -1711,7 +1881,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Shift + Backspace at "<p>   abc[] def</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   const kText = "abc def";
   initializeTest(`<p>   ${kText}</p>`);
   let p = gEditor.querySelector("p");
@@ -1722,8 +1892,11 @@ promise_test(async () => {
   let startOffset = invisibleWhiteSpaces.length + getFirstDifferentOffset(visibleText, kText);
   let length = kText.length + 3 - p.firstChild.data.length;
   // If invisible white-spaces are deleted, they should be contained in the target range.
-  assert_equals(gEditor.innerHTML.replace(/&nbsp;/g, " "),
-      `<p>${invisibleWhiteSpaces + kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${invisibleWhiteSpaces + kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`,
+    t.name,
+    { ignoreWhiteSpaceDifference: true }
+  );
   if (startOffset === kText.length) {
     checkBeforeinputAndInputEventsOnNOOP();
     return;
@@ -1737,7 +1910,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Control + Backspace at "<p>   abc[] def</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   const kText = "abc def";
   initializeTest(`<p>   ${kText}</p>`);
   let p = gEditor.querySelector("p");
@@ -1748,8 +1921,11 @@ promise_test(async () => {
   let startOffset = invisibleWhiteSpaces.length + getFirstDifferentOffset(visibleText, kText);
   let length = kText.length + 3 - p.firstChild.data.length;
   // If invisible white-spaces are deleted, they should be contained in the target range.
-  assert_equals(gEditor.innerHTML.replace(/&nbsp;/g, " "),
-      `<p>${invisibleWhiteSpaces + kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${invisibleWhiteSpaces + kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`,
+    t.name,
+    { ignoreWhiteSpaceDifference: true }
+  );
   if (startOffset === kText.length) {
     checkBeforeinputAndInputEventsOnNOOP();
     return;
@@ -1763,7 +1939,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Alt + Backspace at "<p>   abc[] def</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   const kText = "abc def";
   initializeTest(`<p>   ${kText}</p>`);
   let p = gEditor.querySelector("p");
@@ -1774,8 +1950,10 @@ promise_test(async () => {
   let startOffset = invisibleWhiteSpaces.length + getFirstDifferentOffset(visibleText, kText);
   let length = kText.length + 3 - p.firstChild.data.length;
   // If invisible white-spaces are deleted, they should be contained in the target range.
-  assert_equals(gEditor.innerHTML.replace(/&nbsp;/g, " "),
-      `<p>${invisibleWhiteSpaces + kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${invisibleWhiteSpaces + kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`,
+    t.name
+  );
   if (startOffset === kText.length) {
     checkBeforeinputAndInputEventsOnNOOP();
     return;
diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-forwarddelete.tentative.html b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-forwarddelete.tentative.html
index bbc76f43fbc..440e37dcade 100644
--- a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-forwarddelete.tentative.html
+++ b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-forwarddelete.tentative.html
@@ -13,11 +13,11 @@
 "use strict";
 
 // Simply deletes the next ASCII character of caret position.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p>");
   gSelection.collapse(gEditor.firstChild.firstChild, 2);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>ab</p>");
+  checkEditorContentResultAsSubTest("<p>ab</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: gEditor.firstChild.firstChild,
     startOffset: 2,
@@ -28,11 +28,11 @@ promise_test(async () => {
 }, 'Delete at "<p>ab[]c</p>"');
 
 // Simply deletes the next ASCII character of caret position.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p>");
   gSelection.collapse(gEditor.firstChild.firstChild, 1);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>ac</p>");
+  checkEditorContentResultAsSubTest("<p>ac</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: gEditor.firstChild.firstChild,
     startOffset: 1,
@@ -43,11 +43,11 @@ promise_test(async () => {
 }, 'Delete at "<p>a[]bc</p>"');
 
 // Simply deletes the next ASCII character of caret position.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p>");
   gSelection.collapse(gEditor.firstChild.firstChild, 0);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>bc</p>");
+  checkEditorContentResultAsSubTest("<p>bc</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: gEditor.firstChild.firstChild,
     startOffset: 0,
@@ -57,12 +57,12 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<p>[]abc</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p>");
   let abc = gEditor.querySelector("p").firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abc</p>");
+  checkEditorContentResultAsSubTest("<p>abc</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -72,12 +72,12 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDoNothing();
 }, 'Delete at "<p>abc[]</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc<br></p>");
   let abc = gEditor.querySelector("p").firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abc<br></p>");
+  checkEditorContentResultAsSubTest("<p>abc<br></p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -87,12 +87,15 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDoNothing();
 }, 'Delete at "<p>abc[]<br></p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<p><img src="${kImgSrc}"><br></p>`);
   let p = gEditor.querySelector("p");
   gSelection.collapse(p, 1);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, `<p><img src="${kImgSrc}"><br></p>`);
+  checkEditorContentResultAsSubTest(
+    `<p><img src="${kImgSrc}"><br></p>`,
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -106,12 +109,12 @@ promise_test(async () => {
 // However, we need discussion whether the `<span>` element should be
 // contained by a range of `getTargetRanges()`.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>a<span>b</span>c</p>");
   let a = gEditor.querySelector("span").previousSibling;
   gSelection.collapse(a, 1);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>ac</p>");
+  checkEditorContentResultAsSubTest("<p>ac</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: a,
     startOffset: 1,
@@ -125,12 +128,12 @@ promise_test(async () => {
 // However, we need discussion whether the `<span>` element should be
 // contained by a range of `getTargetRanges()`.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>a<span>b</span>c</p>");
   let b = gEditor.querySelector("span").firstChild;
   gSelection.collapse(b, 0);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>ac</p>");
+  checkEditorContentResultAsSubTest("<p>ac</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: gEditor.firstChild,
     startOffset: 1,
@@ -144,12 +147,17 @@ promise_test(async () => {
 // character is deleted.  If it's deleted, it should be contained by
 // the range of `getTargetRanges()`, but needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc </p>");
   gSelection.collapse(gEditor.firstChild.firstChild, 2);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<p>ab</p>",
-                                      "<p>ab </p>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<p>ab</p>",
+      "<p>ab </p>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: gEditor.firstChild.firstChild,
     startOffset: 2,
@@ -159,7 +167,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<p>ab[]c </p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p><p>def</p>");
   let p1 = gEditor.firstChild;
   let abc = p1.firstChild;
@@ -167,7 +175,7 @@ promise_test(async () => {
   let def = p2.firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -182,7 +190,7 @@ promise_test(async () => {
 // becoming visible when the blocks are joined.  Perhaps, they should be
 // contained by the range of `getTargetRanges()`, but needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc   </p><p>   def</p>");
   let p1 = gEditor.firstChild;
   let abc = p1.firstChild;
@@ -190,7 +198,7 @@ promise_test(async () => {
   let def = p2.firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -205,7 +213,7 @@ promise_test(async () => {
 // becoming visible when the blocks are joined.  Perhaps, they should be
 // contained by the range of `getTargetRanges()`, but needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc   </p><p>   def</p>");
   let p1 = gEditor.firstChild;
   let abc = p1.firstChild;
@@ -213,7 +221,7 @@ promise_test(async () => {
   let def = p2.firstChild;
   gSelection.collapse(abc, 4);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -228,7 +236,7 @@ promise_test(async () => {
 // becoming visible when the blocks are joined.  Perhaps, they should be
 // contained by the range of `getTargetRanges()`, but needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc   </p><p>   def</p>");
   let p1 = gEditor.firstChild;
   let abc = p1.firstChild;
@@ -236,7 +244,7 @@ promise_test(async () => {
   let def = p2.firstChild;
   gSelection.collapse(abc, 5);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -251,7 +259,7 @@ promise_test(async () => {
 // becoming visible when the blocks are joined.  Perhaps, they should be
 // contained by the range of `getTargetRanges()`, but needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc   </p><p>   def</p>");
   let p1 = gEditor.firstChild;
   let abc = p1.firstChild;
@@ -259,7 +267,7 @@ promise_test(async () => {
   let def = p2.firstChild;
   gSelection.collapse(abc, 6);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -269,13 +277,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<p>abc   []</p><p>   def</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p><p><b>def</b></p>");
   let abc = gEditor.querySelector("p").firstChild;
   let def = gEditor.querySelector("b").firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abc<b>def</b></p>");
+  checkEditorContentResultAsSubTest("<p>abc<b>def</b></p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -285,14 +293,19 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<p>abc[]</p><p><b>def</b></p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p><b>abc</b></p><p><b>def</b></p>");
   let abc = gEditor.querySelector("p > b").firstChild;
   let def = gEditor.querySelector("P + p > b").firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<p><b>abc</b><b>def</b></p>",
-                                      "<p><b>abcdef</b></p>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<p><b>abc</b><b>def</b></p>",
+      "<p><b>abcdef</b></p>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -302,13 +315,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<p><b>abc[]</b></p><p><b>def</b></p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p><i>abc</i></p><p><b>def</b></p>");
   let abc = gEditor.querySelector("i").firstChild;
   let def = gEditor.querySelector("b").firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p><i>abc</i><b>def</b></p>");
+  checkEditorContentResultAsSubTest("<p><i>abc</i><b>def</b></p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -324,7 +337,7 @@ promise_test(async () => {
 // deleted.  Perhaps, the invisible white-spaces should be contained by
 // the range of `getTargetRanges()`, but needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<pre>abc   </pre><p>   def</p>");
   let pre = gEditor.firstChild;
   let abc = pre.firstChild;
@@ -332,7 +345,7 @@ promise_test(async () => {
   let def = p.firstChild;
   gSelection.collapse(abc, 6);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<pre>abc   def</pre>");
+  checkEditorContentResultAsSubTest("<pre>abc   def</pre>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 6,
@@ -351,7 +364,7 @@ promise_test(async () => {
 // by additional range of `getTargetRanges()` or not because of the
 // implementation cost and runtime cost.  Needs discuss.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<pre>abc   </pre><p>   def</p>");
   let pre = gEditor.firstChild;
   let abc = pre.firstChild;
@@ -359,7 +372,7 @@ promise_test(async () => {
   let def = p.firstChild;
   gSelection.collapse(abc, 6);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<pre>abc   def</pre>");
+  checkEditorContentResultAsSubTest("<pre>abc   def</pre>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 6,
@@ -376,7 +389,7 @@ promise_test(async () => {
 // be in the range of `getTargetRanges()`, but not so for the preformatted
 // visible leading white-spaces.  But needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc   </p><pre>   def</pre>");
   let p = gEditor.firstChild;
   let abc = p.firstChild;
@@ -384,10 +397,15 @@ promise_test(async () => {
   let def = pre.firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<p>abc &nbsp; def</p>",
-                                      "<p>abc&nbsp;&nbsp; def</p>",
-                                      "<p>abc&nbsp; &nbsp;def</p>",
-                                      "<p>abc &nbsp;&nbsp;def</p>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<p>abc &nbsp; def</p>",
+      "<p>abc&nbsp;&nbsp; def</p>",
+      "<p>abc&nbsp; &nbsp;def</p>",
+      "<p>abc &nbsp;&nbsp;def</p>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -402,7 +420,7 @@ promise_test(async () => {
 // the target range should contain the `<br>` element and block boundaries.
 // But maybe needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc<br></p><p>def</p>");
   let p1 = gEditor.firstChild;
   let abc = p1.firstChild;
@@ -410,7 +428,7 @@ promise_test(async () => {
   let def = p2.firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -420,7 +438,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<p>abc[]<br></p><p>def</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<p><img src="${kImgSrc}"><br></p><p>def</p>`);
   let p1 = gEditor.firstChild;
   let img = p1.firstChild;
@@ -428,7 +446,7 @@ promise_test(async () => {
   let def = p2.firstChild;
   gSelection.collapse(p1, 1);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, `<p><img src="${kImgSrc}">def</p>`);
+  checkEditorContentResultAsSubTest(`<p><img src="${kImgSrc}">def</p>`, t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p1,
     startOffset: 1,
@@ -443,7 +461,7 @@ promise_test(async () => {
 // In this case, the invisible `<br>` element should be contained in the
 // range of `getTargetRanges()`, but needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc<br><br></p><p>def</p>");
   let p1 = gEditor.firstChild;
   let abc = p1.firstChild;
@@ -451,7 +469,7 @@ promise_test(async () => {
   let def = p2.firstChild;
   gSelection.collapse(p1, 2);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abc<br>def</p>");
+  checkEditorContentResultAsSubTest("<p>abc<br>def</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p1,
     startOffset: 2,
@@ -463,13 +481,13 @@ promise_test(async () => {
 
 // Deleting visible `<br>` element should be contained by a range of
 // `getTargetRanges()`.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc<br>def</p>");
   let p = gEditor.querySelector("p");
   let abc = p.firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -481,13 +499,13 @@ promise_test(async () => {
 
 // Deleting visible `<br>` element following white-space should not include
 // the preceding white-space in the range.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc <br>def</p>");
   let p = gEditor.querySelector("p");
   let abc = p.firstChild;
   gSelection.collapse(abc, 4);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abc def</p>");
+  checkEditorContentResultAsSubTest("<p>abc def</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -501,14 +519,14 @@ promise_test(async () => {
 // the following white-space in the range because it shouldn't become
 // visible and should be deleted for avoiding it.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc<br> def</p>");
   let p = gEditor.querySelector("p");
   let abc = p.firstChild;
   let def = gEditor.querySelector("br").nextSibling;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -518,13 +536,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<p>abc[]<br> def</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<p>abc<img src="${kImgSrc}">def</p>`);
   let p = gEditor.querySelector("p");
   let abc = p.firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abcdef</p>");
+  checkEditorContentResultAsSubTest("<p>abcdef</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -536,13 +554,13 @@ promise_test(async () => {
 
 // White-spaces around `<img>` element are visible so that they shouldn't
 // be included into the target ranges.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<p>abc <img src="${kImgSrc}">def</p>`);
   let p = gEditor.querySelector("p");
   let abc = p.firstChild;
   gSelection.collapse(abc, 4);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abc def</p>");
+  checkEditorContentResultAsSubTest("<p>abc def</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -554,13 +572,13 @@ promise_test(async () => {
 
 // White-spaces around `<img>` element are visible so that they shouldn't
 // be included into the target ranges.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<p>abc<img src="${kImgSrc}"> def</p>`);
   let p = gEditor.querySelector("p");
   let abc = p.firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abc def</p>");
+  checkEditorContentResultAsSubTest("<p>abc def</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -570,13 +588,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<p>abc[]<img> def</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<p>abc<img src="${kImgSrc}"><img src="${kImgSrc}">def</p>`);
   let p = gEditor.querySelector("p");
   let abc = p.firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, `<p>abc<img src="${kImgSrc}">def</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>abc<img src="${kImgSrc}">def</p>`,
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -586,12 +607,15 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<p>abc[]<img><img>def</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<p>abc<img src="${kImgSrc}"><img src="${kImgSrc}">def</p>`);
   let p = gEditor.querySelector("p");
   gSelection.collapse(p, 2);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, `<p>abc<img src="${kImgSrc}">def</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>abc<img src="${kImgSrc}">def</p>`,
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 2,
@@ -601,13 +625,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<p>abc<img>{}<img>def</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<div>abc<hr>def</div>`);
   let div = gEditor.querySelector("div");
   let abc = div.firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<div>abcdef</div>");
+  checkEditorContentResultAsSubTest("<div>abcdef</div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: div,
     startOffset: 1,
@@ -621,13 +645,13 @@ promise_test(async () => {
 // they should be included into the target ranges to avoid they become
 // visible.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<div>abc <hr>def</div>`);
   let div = gEditor.querySelector("div");
   let abc = div.firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<div>abcdef</div>");
+  checkEditorContentResultAsSubTest("<div>abcdef</div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: div,
     startOffset: 1,
@@ -641,13 +665,13 @@ promise_test(async () => {
 // they should be included into the target ranges to avoid they become
 // visible.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<div>abc<hr> def</div>`);
   let div = gEditor.querySelector("div");
   let abc = div.firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<div>abcdef</div>");
+  checkEditorContentResultAsSubTest("<div>abcdef</div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: div,
     startOffset: 1,
@@ -659,13 +683,13 @@ promise_test(async () => {
 
 // Invisible `<br>` element immediately before `<hr>` element should be
 // delete once, and both of them should be included in the target range.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<div>abc<br><hr>def</div>`);
   let div = gEditor.querySelector("div");
   let abc = div.firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<div>abcdef</div>");
+  checkEditorContentResultAsSubTest("<div>abcdef</div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: div,
     startOffset: 1,
@@ -675,13 +699,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div>abc[]<br><hr>def</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<div><img src="${kImgSrc}"><br><hr>def</div>`);
   let div = gEditor.querySelector("div");
   let img = div.firstChild;
   gSelection.collapse(div, 1);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, `<div><img src="${kImgSrc}">def</div>`);
+  checkEditorContentResultAsSubTest(
+    `<div><img src="${kImgSrc}">def</div>`,
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: div,
     startOffset: 1,
@@ -691,15 +718,20 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div><img>{}<br><hr>def</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<p>def<br>ghi</p></div>");
   let p = gEditor.querySelector("p");
   let def = p.firstChild;
   let abc = gEditor.firstChild.firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<div>abcdef<p>ghi</p></div>",
-                                      "<div>abcdef<br><p>ghi</p></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div>abcdef<p>ghi</p></div>",
+      "<div>abcdef<br><p>ghi</p></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -709,7 +741,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div>abc[]<p>def<br>ghi</p></div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<br><p>def<br>ghi</p></div>");
   let div = gEditor.firstChild;
   let p = gEditor.querySelector("p");
@@ -717,8 +749,13 @@ promise_test(async () => {
   let abc = div.firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<div>abcdef<p>ghi</p></div>",
-                                      "<div>abcdef<br><p>ghi</p></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div>abcdef<p>ghi</p></div>",
+      "<div>abcdef<br><p>ghi</p></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: div,
     startOffset: 1,
@@ -728,7 +765,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div>abc[]<br><p>def<br>ghi</p></div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<div><img src="${kImgSrc}"><br><p>def<br>ghi</p></div>`);
   let div = gEditor.firstChild;
   let p = gEditor.querySelector("p");
@@ -736,8 +773,13 @@ promise_test(async () => {
   let abc = div.firstChild;
   gSelection.collapse(div, 1);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, [`<div><img src="${kImgSrc}">def<p>ghi</p></div>`,
-                                      `<div><img src="${kImgSrc}">def<br><p>ghi</p></div>`]);
+  checkEditorContentResultAsSubTest(
+    [
+      `<div><img src="${kImgSrc}">def<p>ghi</p></div>`,
+      `<div><img src="${kImgSrc}">def<br><p>ghi</p></div>`,
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: div,
     startOffset: 1,
@@ -752,15 +794,20 @@ promise_test(async () => {
 // the child block, and they should be contained in a range of
 // `getTargetRanges()`, but maybe needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc   <p>   def<br>ghi</p></div>");
   let p = gEditor.querySelector("p");
   let def = p.firstChild;
   let abc = gEditor.firstChild.firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<div>abcdef<p>ghi</p></div>",
-                                      "<div>abcdef<br><p>ghi</p></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div>abcdef<p>ghi</p></div>",
+      "<div>abcdef<br><p>ghi</p></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -770,13 +817,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div>abc[]   <p>   def<br>ghi</p></div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<p><b>def</b></p></div>");
   let abc = gEditor.querySelector("div").firstChild;
   let def = gEditor.querySelector("b").firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<div>abc<b>def</b></div>");
+  checkEditorContentResultAsSubTest("<div>abc<b>def</b></div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -786,14 +833,19 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div>abc[]<p><b>def</b></p></div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><b>abc</b><p><b>def</b></p></div>");
   let abc = gEditor.querySelector("b").firstChild;
   let def = gEditor.querySelector("p > b").firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<div><b>abc</b><b>def</b></div>",
-                                      "<div><b>abcdef</b></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div><b>abc</b><b>def</b></div>",
+      "<div><b>abcdef</b></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -803,13 +855,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div><b>abc[]</b><p><b>def</b></p></div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><i>abc</i><p><b>def</b></p></div>");
   let abc = gEditor.querySelector("i").firstChild;
   let def = gEditor.querySelector("b").firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<div><i>abc</i><b>def</b></div>");
+  checkEditorContentResultAsSubTest("<div><i>abc</i><b>def</b></div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -819,14 +871,19 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div><i>abc[]</i><p><b>def</b></p></div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><p>abc</p>def</div>");
   let abc = gEditor.querySelector("p").firstChild;
   let def = gEditor.querySelector("p").nextSibling;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<div><p>abcdef</p></div>",
-                                      "<div><p>abcdef<br></p></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div><p>abcdef</p></div>",
+      "<div><p>abcdef<br></p></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -836,15 +893,20 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div><p>abc[]</p>def</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><p>abc<br></p>def</div>");
   let p = gEditor.querySelector("p");
   let abc = p.firstChild;
   let def = p.nextSibling;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<div><p>abcdef</p></div>",
-                                      "<div><p>abcdef<br></p></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div><p>abcdef</p></div>",
+      "<div><p>abcdef<br></p></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -854,15 +916,20 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div><p>abc[]<br></p>def</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<div><p><img src="${kImgSrc}"><br></p>def</div>`);
   let p = gEditor.querySelector("p");
   let abc = p.firstChild;
   let def = p.nextSibling;
   gSelection.collapse(p, 1);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, [`<div><p><img src="${kImgSrc}">def</p></div>`,
-                                      `<div><p><img src="${kImgSrc}">def<br></p></div>`]);
+  checkEditorContentResultAsSubTest(
+    [
+      `<div><p><img src="${kImgSrc}">def</p></div>`,
+      `<div><p><img src="${kImgSrc}">def<br></p></div>`,
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 1,
@@ -877,14 +944,19 @@ promise_test(async () => {
 // in the parent block, and they should be contained by a range of
 // `getTargetRanges()`, but maybe needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><p>abc   </p>   def</div>");
   let abc = gEditor.querySelector("p").firstChild;
   let def = gEditor.querySelector("p").nextSibling;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<div><p>abcdef</p></div>",
-                                      "<div><p>abcdef<br></p></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div><p>abcdef</p></div>",
+      "<div><p>abcdef<br></p></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -894,13 +966,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div><p>abc[]   </p>   def</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><p><b>abc</b></p>def</div>");
   let abc = gEditor.querySelector("b").firstChild;
   let def = gEditor.querySelector("p").nextSibling;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<div><p><b>abc</b>def</p></div>");
+  checkEditorContentResultAsSubTest("<div><p><b>abc</b>def</p></div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -910,14 +982,19 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div><p><b>abc[]</b></p>def</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><p><b>abc</b></p><b>def</b></div>");
   let abc = gEditor.querySelector("b").firstChild;
   let def = gEditor.querySelector("div > b").firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<div><p><b>abc</b><b>def</b></p></div>",
-                                      "<div><p><b>abcdef</b></p></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div><p><b>abc</b><b>def</b></p></div>",
+      "<div><p><b>abcdef</b></p></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -927,13 +1004,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div><p><b>abc[]</b></p><b>def</b></div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><p><b>abc</b></p><i>def</i></div>");
   let abc = gEditor.querySelector("b").firstChild;
   let def = gEditor.querySelector("i").firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<div><p><b>abc</b><i>def</i></p></div>");
+  checkEditorContentResultAsSubTest(
+    "<div><p><b>abc</b><i>def</i></p></div>",
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -943,13 +1023,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div><p><b>abc[]</b></p><i>def</i></div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li></ul>ghi</div>");
   let abc = gEditor.querySelector("div").firstChild;
   let def = gEditor.querySelector("li").firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<div>abcdefghi</div>");
+  checkEditorContentResultAsSubTest("<div>abcdefghi</div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -959,13 +1039,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div>abc[]<ul><li>def</li></ul>ghi</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc  <ul><li> def </li></ul>  ghi</div>");
   let abc = gEditor.querySelector("div").firstChild;
   let def = gEditor.querySelector("li").firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<div>abcdefghi</div>");
+  checkEditorContentResultAsSubTest("<div>abcdefghi</div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -975,13 +1055,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div>abc[]  <ul><li> def </li></ul>  ghi</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc  <ul><li> def </li></ul>  ghi</div>");
   let abc = gEditor.querySelector("div").firstChild;
   let def = gEditor.querySelector("li").firstChild;
   gSelection.collapse(abc, abc.length);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<div>abcdefghi</div>");
+  checkEditorContentResultAsSubTest("<div>abcdefghi</div>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -991,13 +1071,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div>abc  []<ul><li> def </li></ul>  ghi</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li></ul>ghi</div>");
   let def = gEditor.querySelector("li").firstChild;
   let ghi = gEditor.querySelector("ul").nextSibling;
   gSelection.collapse(def, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<div>abc<ul><li>defghi</li></ul></div>");
+  checkEditorContentResultAsSubTest(
+    "<div>abc<ul><li>defghi</li></ul></div>",
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: def,
     startOffset: 3,
@@ -1007,15 +1090,20 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div>abc<ul><li>def[]</li></ul>ghi</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc <ul><li>  def  </li></ul> ghi</div>");
   let def = gEditor.querySelector("li").firstChild;
   let ghi = gEditor.querySelector("ul").nextSibling;
   gSelection.collapse(def, 5);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<div>abc <ul><li>  defghi</li></ul></div>",
-                                      "<div>abc <ul><li>defghi</li></ul></div>",
-                                      "<div>abc<ul><li>defghi</li></ul></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div>abc <ul><li>  defghi</li></ul></div>",
+      "<div>abc <ul><li>defghi</li></ul></div>",
+      "<div>abc<ul><li>defghi</li></ul></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: def,
     startOffset: 5,
@@ -1025,15 +1113,20 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div>abc <ul><li>  def[]  </li></ul> ghi</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc <ul><li>  def  </li></ul> ghi</div>");
   let def = gEditor.querySelector("li").firstChild;
   let ghi = gEditor.querySelector("ul").nextSibling;
   gSelection.collapse(def, def.length);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<div>abc <ul><li>  defghi</li></ul></div>",
-                                      "<div>abc <ul><li>defghi</li></ul></div>",
-                                      "<div>abc<ul><li>defghi</li></ul></div>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<div>abc <ul><li>  defghi</li></ul></div>",
+      "<div>abc <ul><li>defghi</li></ul></div>",
+      "<div>abc<ul><li>defghi</li></ul></div>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: def,
     startOffset: 5,
@@ -1043,13 +1136,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div>abc <ul><li>  def  []</li></ul> ghi</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li><li>ghi</li></ul>jkl</div>");
   let abc = gEditor.querySelector("div").firstChild;
   let def = gEditor.querySelector("li").firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<div>abcdef<ul><li>ghi</li></ul>jkl</div>");
+  checkEditorContentResultAsSubTest(
+    "<div>abcdef<ul><li>ghi</li></ul>jkl</div>",
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -1059,13 +1155,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div>abc[]<ul><li>def</li><li>ghi</li></ul>jkl</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li><li>ghi</li></ul>jkl</div>");
   let def = gEditor.querySelector("li").firstChild;
   let ghi = gEditor.querySelector("li + li").firstChild;
   gSelection.collapse(def, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<div>abc<ul><li>defghi</li></ul>jkl</div>");
+  checkEditorContentResultAsSubTest(
+    "<div>abc<ul><li>defghi</li></ul>jkl</div>",
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: def,
     startOffset: 3,
@@ -1075,13 +1174,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<div>abc<ul><li>def[]</li><li>ghi</li></ul>jkl</div>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li><li>ghi</li></ul>jkl</div>");
   let ghi = gEditor.querySelector("li + li").firstChild;
   let jkl = gEditor.querySelector("ul").nextSibling;
   gSelection.collapse(ghi, 3);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<div>abc<ul><li>def</li><li>ghijkl</li></ul></div>");
+  checkEditorContentResultAsSubTest(
+    "<div>abc<ul><li>def</li><li>ghijkl</li></ul></div>",
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: ghi,
     startOffset: 3,
@@ -1095,14 +1197,14 @@ promise_test(async () => {
 // case, it should be treated as joining with the previous paragraph.
 // The target range should include the invisible <br> element in the empty
 // paragraph.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p><br></p><p>abc</p>");
   let p1 = gEditor.querySelector("p");
   let p2 = p1.nextSibling;
   let abc = p2.firstChild;
   gSelection.collapse(p1, 0);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abc</p>");
+  checkEditorContentResultAsSubTest("<p>abc</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p1,
     startOffset: 0,
@@ -1114,7 +1216,7 @@ promise_test(async () => {
 
 // Delete ignore the empty span and the other things must be same as the
 // previous test.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p><span></span><br></p><p>abc</p>");
   let p1 = gEditor.querySelector("p");
   let span = p1.firstChild;
@@ -1122,7 +1224,7 @@ promise_test(async () => {
   let abc = p2.firstChild;
   gSelection.collapse(span, 0);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p>abc</p>");
+  checkEditorContentResultAsSubTest("<p>abc</p>", t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p1,
     startOffset: 0,
@@ -1134,15 +1236,20 @@ promise_test(async () => {
 
 // If invisible white-spaces are removed with same action as above tests,
 // the range should be included in the target ranges.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p><br></p><p>  abc</p>");
   let p1 = gEditor.querySelector("p");
   let p2 = p1.nextSibling;
   let abc = p2.firstChild;
   gSelection.collapse(p1, 0);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<p>  abc</p>",
-                                      "<p>abc</p>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<p>  abc</p>",
+      "<p>abc</p>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p1,
     startOffset: 0,
@@ -1154,14 +1261,17 @@ promise_test(async () => {
 
 // If the next block begins with non-editable content, target range
 // should be at the non-editable content node.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p><br></p><p><span contenteditable=\"false\">abc</span>def</p>");
   let p1 = gEditor.querySelector("p");
   let p2 = p1.nextSibling;
   let span = gEditor.querySelector("span");
   gSelection.collapse(p1, 0);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<p><span contenteditable=\"false\">abc</span>def</p>");
+  checkEditorContentResultAsSubTest(
+    "<p><span contenteditable=\"false\">abc</span>def</p>",
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p1,
     startOffset: 0,
@@ -1174,7 +1284,7 @@ promise_test(async () => {
 // If next non-editable paragraph is deleted, target range should end
 // with start of the text node in the last paragraph.  Otherwise, ends at
 // the non-editable paragraph.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p><br></p><p contenteditable=\"false\">abc</p><p>def</p>");
   let p1 = gEditor.querySelector("p");
   let p2 = p1.nextSibling;
@@ -1182,8 +1292,13 @@ promise_test(async () => {
   let def = p3.firstChild;
   gSelection.collapse(p3, 0);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<p>def</p>",
-                                      "<p contenteditable=\"false\">abc</p><p>def</p>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<p>def</p>",
+      "<p contenteditable=\"false\">abc</p><p>def</p>",
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p1,
     startOffset: 0,
@@ -1193,15 +1308,20 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<p>{}<br></p><p contenteditable=\"false\">abc</p><p>def</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc<span contenteditable=\"false\">def</span>ghi</p>");
   let p = gEditor.querySelector("p");
   let abc = p.firstChild;
   gSelection.collapse(abc, 3);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<p>abc<span contenteditable=\"false\">def</span>ghi</p>",
-                                      "<p>abcghi</p>",
-                                      "<p>abcghi<br></p>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<p>abc<span contenteditable=\"false\">def</span>ghi</p>",
+      "<p>abcghi</p>",
+      "<p>abcghi<br></p>",
+    ],
+    t.name
+  );
   if (gEditor.innerHTML === "<p>abc<span contenteditable=\"false\">def</span>ghi</p>") {
     checkGetTargetRangesOfBeforeinputOnDeleteSomething({
       startContainer: abc,
@@ -1224,14 +1344,19 @@ promise_test(async () => {
 }, 'Delete at "<p>abc[]<span contenteditable=\"false\">def</span>ghi</p>"');
 
 // If just removes the paragraph, target range should end at the table element.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p><br></p><table><tr><td>cell</td></tr></table>");
   let cell = gEditor.querySelector("td");
   let p = gEditor.querySelector("p");
   gSelection.collapse(p, 0);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td>cell</td></tr></tbody></table>",
-                                      "<p><br></p><table><tbody><tr><td>cell</td></tr></tbody></table>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td>cell</td></tr></tbody></table>",
+      "<p><br></p><table><tbody><tr><td>cell</td></tr></tbody></table>",
+    ],
+    t.name
+  );
   if (p.isConnected) {
     checkGetTargetRangesOfBeforeinputOnDeleteSomething({
       startContainer: p,
@@ -1253,13 +1378,16 @@ promise_test(async () => {
 
 // If table cell won't be joined, target range should be collapsed in the
 // cell.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td><br></td><td>cell2</td></tr></table>");
   let cell1 = gEditor.querySelector("td");
   let cell2 = cell1.nextSibling;
   gSelection.collapse(cell1, 0);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<table><tbody><tr><td><br></td><td>cell2</td></tr></tbody></table>");
+  checkEditorContentResultAsSubTest(
+    "<table><tbody><tr><td><br></td><td>cell2</td></tr></tbody></table>",
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: cell1,
     startOffset: 0,
@@ -1271,12 +1399,15 @@ promise_test(async () => {
 
 // If table caption won't be deleted, target range should be collapsed in the
 // caption element.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><caption><br></caption><tr><td>cell</td></tr></table>");
   let caption = gEditor.querySelector("caption");
   gSelection.collapse(caption, 0);
   await sendDeleteKey();
-  assert_equals(gEditor.innerHTML, "<table><caption><br></caption><tbody><tr><td>cell</td></tr></tbody></table>");
+  checkEditorContentResultAsSubTest(
+    "<table><caption><br></caption><tbody><tr><td>cell</td></tr></tbody></table>",
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: caption,
     startOffset: 0,
@@ -1287,14 +1418,19 @@ promise_test(async () => {
 }, 'Delete at "<table><caption>{}<br></caption><tr><td>cell</td></tr></table>"');
 
 // If a table cell element is selected, only its content should be deleted.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr></table>");
   let cell1 = gEditor.querySelector("td");
   let tr = cell1.parentNode;
   gSelection.setBaseAndExtent(tr, 0, tr, 1);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td><td>cell2</td></tr></tbody></table>",
-                                      "<table><tbody><tr><td><br></td><td>cell2</td></tr></tbody></table>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td></td><td>cell2</td></tr></tbody></table>",
+      "<table><tbody><tr><td><br></td><td>cell2</td></tr></tbody></table>",
+    ],
+    t.name
+  );
   // XXX Perhaps, target range should be selecting only all children of
   //     cell1 instead.
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
@@ -1306,14 +1442,19 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<table><tr>{<td>cell1</td>}<td>cell2</td></tr></table>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr></table>");
   let cell2 = gEditor.querySelector("td + td");
   let tr = cell2.parentNode;
   gSelection.setBaseAndExtent(tr, 1, tr, 2);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td>cell1</td><td></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td>cell1</td><td><br></td></tr></tbody></table>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td>cell1</td><td></td></tr></tbody></table>",
+      "<table><tbody><tr><td>cell1</td><td><br></td></tr></tbody></table>",
+    ],
+    t.name
+  );
   // XXX Perhaps, target range should be selecting only all children of
   //     cell1 instead.
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
@@ -1326,16 +1467,21 @@ promise_test(async () => {
 }, 'Delete at "<table><tr><td>cell1</td>{<td>cell2</td>}</tr></table>"');
 
 // If the last table cell element is selected, what browsers should do?
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell</td></tr></table>");
   let cell = gEditor.querySelector("td");
   let tr = cell.parentNode;
   let table = gEditor.querySelector("table");
   gSelection.setBaseAndExtent(tr, 0, tr, 1);
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td><br></td></tr></tbody></table>",
-                                      "<br>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td></td></tr></tbody></table>",
+      "<table><tbody><tr><td><br></td></tr></tbody></table>",
+      "<br>",
+    ],
+    t.name
+  );
   if (gEditor.querySelector("table")) {
     // XXX Perhaps, target range should be selecting only all children of
     //     cell1 instead.
@@ -1359,7 +1505,7 @@ promise_test(async () => {
 }, 'Delete at "<table><tr>{<td>cell</td>}</tr></table>"');
 
 // Testing multiple cell selection mode.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr><tr><td>cell3</td><td>cell4</td></tr></table>");
   let cell1 = gEditor.querySelector("td");
   let cell4 = gEditor.querySelector("tr + tr > td + td");
@@ -1374,8 +1520,13 @@ promise_test(async () => {
   gSelection.addRange(range);
   assert_equals(gSelection.rangeCount, 2, "Should support multiple cell selection");
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td><td>cell2</td></tr><tr><td>cell3</td><td></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td><br></td><td>cell2</td></tr><tr><td>cell3</td><td><br></td></tr></tbody></table>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td></td><td>cell2</td></tr><tr><td>cell3</td><td></td></tr></tbody></table>",
+      "<table><tbody><tr><td><br></td><td>cell2</td></tr><tr><td>cell3</td><td><br></td></tr></tbody></table>",
+    ],
+    t.name
+  );
   // XXX Perhaps, target range should be selecting only all children of
   //     cell1 and cell4 instead.
   checkGetTargetRangesOfBeforeinputOnDeleteSomething([
@@ -1395,7 +1546,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<table><tr>{<td>cell1</td>}<td>cell2</td></tr><tr><td>cell3</td>{<td>cell4</td>}</tr></table>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr><tr><td>cell3</td><td>cell4</td></tr></table>");
   let cell1 = gEditor.querySelector("td");
   let cell3 = gEditor.querySelector("tr + tr > td");
@@ -1410,9 +1561,14 @@ promise_test(async () => {
   gSelection.addRange(range);
   assert_equals(gSelection.rangeCount, 2, "Should support multiple cell selection");
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td><td>cell2</td></tr><tr><td></td><td>cell4</td></tr></tbody></table>",
-                                      "<table><tbody><tr><td><br></td><td>cell2</td></tr><tr><td><br></td><td>cell4</td></tr></tbody></table>",
-                                      "<table><tbody><tr><td>cell2</td></tr><tr><td>cell4</td></tr></tbody></table>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td></td><td>cell2</td></tr><tr><td></td><td>cell4</td></tr></tbody></table>",
+      "<table><tbody><tr><td><br></td><td>cell2</td></tr><tr><td><br></td><td>cell4</td></tr></tbody></table>",
+      "<table><tbody><tr><td>cell2</td></tr><tr><td>cell4</td></tr></tbody></table>",
+    ],
+    t.name
+  );
   // XXX Perhaps, target range should be selecting only all children of
   //     cell1 and cell3 instead.
   checkGetTargetRangesOfBeforeinputOnDeleteSomething([
@@ -1432,7 +1588,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<table><tr>{<td>cell1</td>}<td>cell2</td></tr><tr>{<td>cell3</td>}<td>cell4</td></tr></table>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr><tr><td>cell3</td><td>cell4</td></tr></table>");
   let cell1 = gEditor.querySelector("td");
   let cell2 = gEditor.querySelector("td + td");
@@ -1447,9 +1603,14 @@ promise_test(async () => {
   gSelection.addRange(range);
   assert_equals(gSelection.rangeCount, 2, "Should support multiple cell selection");
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td><td></td></tr><tr><td>cell3</td><td>cell4</td></tr></tbody></table>",
-                                      "<table><tbody><tr><td><br></td><td><br></td></tr><tr><td>cell3</td><td>cell4</td></tr></tbody></table>",
-                                      "<table><tbody><tr><td>cell3</td><td>cell4</td></tr></tbody></table>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td></td><td></td></tr><tr><td>cell3</td><td>cell4</td></tr></tbody></table>",
+      "<table><tbody><tr><td><br></td><td><br></td></tr><tr><td>cell3</td><td>cell4</td></tr></tbody></table>",
+      "<table><tbody><tr><td>cell3</td><td>cell4</td></tr></tbody></table>",
+    ],
+    t.name
+  );
   if (gEditor.querySelector("tr + tr")) {
     // XXX Perhaps, target range should be selecting only all children of
     //     cell1 and cell2 instead.
@@ -1478,7 +1639,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<table><tr>{<td>cell1</td>}{<td>cell2</td>}</tr><tr><td>cell3</td><td>cell4</td></tr></table>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr><tr><td>cell3</td><td>cell4</td></tr></table>");
   let cell3 = gEditor.querySelector("tr + tr > td");
   let cell4 = gEditor.querySelector("tr + tr > td + td");
@@ -1492,9 +1653,14 @@ promise_test(async () => {
   gSelection.addRange(range);
   assert_equals(gSelection.rangeCount, 2, "Should support multiple cell selection");
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td>cell1</td><td>cell2</td></tr><tr><td></td><td></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td>cell1</td><td>cell2</td></tr><tr><td><br></td><td><br></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td>cell1</td><td>cell2</td></tr></tbody></table>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td>cell1</td><td>cell2</td></tr><tr><td></td><td></td></tr></tbody></table>",
+      "<table><tbody><tr><td>cell1</td><td>cell2</td></tr><tr><td><br></td><td><br></td></tr></tbody></table>",
+      "<table><tbody><tr><td>cell1</td><td>cell2</td></tr></tbody></table>",
+    ],
+    t.name
+  );
   if (gEditor.querySelector("tr + tr")) {
     // XXX Perhaps, target range should be selecting only all children of
     //     cell3 and cell4 instead.
@@ -1523,7 +1689,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<table><tr><td>cell1</td><td>cell2</td></tr><tr>{<td>cell3</td>}{<td>cell4</td>}</tr></table>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr><tr><td>cell3</td><td>cell4</td></tr></table>");
   let cell1 = gEditor.querySelector("td");
   let cell2 = gEditor.querySelector("td + td");
@@ -1546,9 +1712,14 @@ promise_test(async () => {
   gSelection.addRange(range);
   assert_equals(gSelection.rangeCount, 4, "Should support multiple cell selection");
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td><td></td></tr><tr><td></td><td></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td></tr></tbody></table>",
-                                      "<br>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td></td><td></td></tr><tr><td></td><td></td></tr></tbody></table>",
+      "<table><tbody><tr><td><br></td><td><br></td></tr><tr><td><br></td><td><br></td></tr></tbody></table>",
+      "<br>",
+    ],
+    t.name
+  );
   if (gEditor.querySelector("table")) {
     // XXX Perhaps, target range should be selecting only all children of
     //     cell1, cell2, cell3 and cell4 instead.
@@ -1589,7 +1760,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Delete at "<table><tr>{<td>cell1</td>}{<td>cell2</td>}</tr><tr>{<td>cell3</td>}{<td>cell4</td>}</tr></table>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr><tr><td>cell3</td><td>cell4</td></tr></table>");
   let cell1 = gEditor.querySelector("td");
   let cell2 = gEditor.querySelector("td + td");
@@ -1609,10 +1780,15 @@ promise_test(async () => {
   gSelection.addRange(range);
   assert_equals(gSelection.rangeCount, 3, "Should support multiple cell selection");
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td><td>cell2</td></tr><tr><td>cell3</td><td></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td><br></td><td>cell2</td></tr><tr><td>cell3</td><td><br></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td></td><td>c2</td></tr><tr><td>cell3</td><td></td></tr></tbody></table>",
-                                      "<table><tbody><tr><td><br></td><td>c2</td></tr><tr><td>cell3</td><td><br></td></tr></tbody></table>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<table><tbody><tr><td></td><td>cell2</td></tr><tr><td>cell3</td><td></td></tr></tbody></table>",
+      "<table><tbody><tr><td><br></td><td>cell2</td></tr><tr><td>cell3</td><td><br></td></tr></tbody></table>",
+      "<table><tbody><tr><td></td><td>c2</td></tr><tr><td>cell3</td><td></td></tr></tbody></table>",
+      "<table><tbody><tr><td><br></td><td>c2</td></tr><tr><td>cell3</td><td><br></td></tr></tbody></table>",
+    ],
+    t.name
+  );
   if (cell2.firstChild.length == "cell2".length) {
     // XXX Perhaps, target range should be selecting only all children of
     //     cell1 and cell4 instead.
@@ -1657,16 +1833,21 @@ promise_test(async () => {
 
 // If caret is not adjacent of deleting character, browser may not delete the
 // character, but update the caret position for next deletion.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>hello&#x5E9;&#x5DC;&#x5D5;&#x5DD;</p>");
   let text1 = gEditor.querySelector("p").firstChild;
   let text2 = text1.nextSibling;
   gSelection.collapse(text1, 4);
   await sendArrowRightKey();
   await sendDeleteKey();
-  assert_in_array(gEditor.innerHTML, ["<p>hello\u05E9\u05DC\u05D5\u05DD</p>",
-                                      "<p>hello\u05DC\u05D5\u05DD</p>",
-                                      "<p>hello\u05E9\u05DC\u05D5</p>"]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<p>hello\u05E9\u05DC\u05D5\u05DD</p>",
+      "<p>hello\u05DC\u05D5\u05DD</p>",
+      "<p>hello\u05E9\u05DC\u05D5</p>",
+    ],
+    t.name
+  );
   if (gEditor.innerHTML === "<p>hello\u05E9\u05DC\u05D5\u05DD</p>") {
     checkGetTargetRangesOfBeforeinputOnDeleteSomething({
       startContainer: text2 ? text2 : text1,
@@ -1710,7 +1891,7 @@ function getFirstDifferentOffset(currentString, originalString) {
   return currentString.length;
 }
 
-promise_test(async () => {
+promise_test(async (t) => {
   const kText = "abc def ghi";
   initializeTest(`<p>${kText}</p>`);
   let p = gEditor.querySelector("p");
@@ -1718,8 +1899,11 @@ promise_test(async () => {
   await sendDeleteKey(kShift);
   let startOffset = getFirstDifferentOffset(p.firstChild.data, kText);
   let length = kText.length - p.firstChild.data.length;
-  assert_equals(gEditor.innerHTML.replace(/&nbsp;/g, " "),
-      `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`,
+    t.name,
+    { ignoreWhiteSpaceDifference: true }
+  );
   if (startOffset === kText.length) {
     checkBeforeinputAndInputEventsOnNOOP();
     return;
@@ -1733,7 +1917,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Shift + Delete at "<p>abc []def ghi</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   const kText = "abc def ghi";
   initializeTest(`<p>${kText}</p>`);
   let p = gEditor.querySelector("p");
@@ -1741,8 +1925,11 @@ promise_test(async () => {
   await sendDeleteKey(kControl);
   let startOffset = getFirstDifferentOffset(p.firstChild.data, kText);
   let length = kText.length - p.firstChild.data.length;
-  assert_equals(gEditor.innerHTML.replace(/&nbsp;/g, " "),
-      `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`,
+    t.name,
+    { ignoreWhiteSpaceDifference: true }
+  );
   if (startOffset === kText.length) {
     checkBeforeinputAndInputEventsOnNOOP();
     return;
@@ -1756,7 +1943,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Control + Delete at "<p>abc []def ghi</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   const kText = "abc def ghi";
   initializeTest(`<p>${kText}</p>`);
   let p = gEditor.querySelector("p");
@@ -1764,8 +1951,11 @@ promise_test(async () => {
   await sendDeleteKey(kAlt);
   let startOffset = getFirstDifferentOffset(p.firstChild.data, kText);
   let length = kText.length - p.firstChild.data.length;
-  assert_equals(gEditor.innerHTML.replace(/&nbsp;/g, " "),
-      `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`,
+    t.name,
+    { ignoreWhiteSpaceDifference: true }
+  );
   if (startOffset === kText.length) {
     checkBeforeinputAndInputEventsOnNOOP();
     return;
@@ -1779,7 +1969,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Alt + Delete at "<p>abc []def ghi</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   const kText = "abc def ghi";
   initializeTest(`<p>${kText}</p>`);
   let p = gEditor.querySelector("p");
@@ -1787,8 +1977,11 @@ promise_test(async () => {
   await sendDeleteKey(kMeta);
   let startOffset = getFirstDifferentOffset(p.firstChild.data, kText);
   let length = kText.length - p.firstChild.data.length;
-  assert_equals(gEditor.innerHTML.replace(/&nbsp;/g, " "),
-      `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length)}</p>`,
+    t.name,
+    { ignoreWhiteSpaceDifference: true }
+  );
   if (startOffset === kText.length) {
     checkBeforeinputAndInputEventsOnNOOP();
     return;
@@ -1802,7 +1995,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Meta + Delete at "<p>abc []def ghi</p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   const kText = "abc def";
   initializeTest(`<p>${kText}   </p>`);
   let p = gEditor.querySelector("p");
@@ -1813,8 +2006,11 @@ promise_test(async () => {
   let startOffset = invisibleWhiteSpaces.length + getFirstDifferentOffset(visibleText, kText);
   let length = kText.length + 3 - p.firstChild.data.length;
   // If invisible white-spaces are deleted, they should be contained in the target range.
-  assert_equals(gEditor.innerHTML.replace(/&nbsp;/g, " "),
-      `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length) + invisibleWhiteSpaces}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length) + invisibleWhiteSpaces}</p>`,
+    t.name,
+    { ignoreWhiteSpaceDifference: true }
+  );
   if (startOffset === kText.length) {
     checkBeforeinputAndInputEventsOnNOOP();
     return;
@@ -1828,7 +2024,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Shift + Delete at "<p>abc []def   </p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   const kText = "abc def";
   initializeTest(`<p>${kText}   </p>`);
   let p = gEditor.querySelector("p");
@@ -1839,8 +2035,11 @@ promise_test(async () => {
   let startOffset = invisibleWhiteSpaces.length + getFirstDifferentOffset(visibleText, kText);
   let length = kText.length + 3 - p.firstChild.data.length;
   // If invisible white-spaces are deleted, they should be contained in the target range.
-  assert_equals(gEditor.innerHTML.replace(/&nbsp;/g, " "),
-      `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length) + invisibleWhiteSpaces}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length) + invisibleWhiteSpaces}</p>`,
+    t.name,
+    { ignoreWhiteSpaceDifference: true }
+  );
   if (startOffset === kText.length) {
     checkBeforeinputAndInputEventsOnNOOP();
     return;
@@ -1854,7 +2053,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Control + Delete at "<p>abc []def   </p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   const kText = "abc def";
   initializeTest(`<p>${kText}   </p>`);
   let p = gEditor.querySelector("p");
@@ -1865,8 +2064,11 @@ promise_test(async () => {
   let startOffset = invisibleWhiteSpaces.length + getFirstDifferentOffset(visibleText, kText);
   let length = kText.length + 3 - p.firstChild.data.length;
   // If invisible white-spaces are deleted, they should be contained in the target range.
-  assert_equals(gEditor.innerHTML.replace(/&nbsp;/g, " "),
-      `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length) + invisibleWhiteSpaces}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length) + invisibleWhiteSpaces}</p>`,
+    t.name,
+    { ignoreWhiteSpaceDifference: true }
+  );
   if (startOffset === kText.length) {
     checkBeforeinputAndInputEventsOnNOOP();
     return;
@@ -1880,7 +2082,7 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, 'Alt + Delete at "<p>abc []def   </p>"');
 
-promise_test(async () => {
+promise_test(async (t) => {
   const kText = "abc def";
   initializeTest(`<p>${kText}   s</p>`);
   let p = gEditor.querySelector("p");
@@ -1891,8 +2093,11 @@ promise_test(async () => {
   let startOffset = invisibleWhiteSpaces.length + getFirstDifferentOffset(visibleText, kText);
   let length = kText.length + 3 - p.firstChild.data.length;
   // If invisible white-spaces are deleted, they should be contained in the target range.
-  assert_equals(gEditor.innerHTML.replace(/&nbsp;/g, " "),
-      `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length) + invisibleWhiteSpaces}</p>`);
+  checkEditorContentResultAsSubTest(
+      `<p>${kText.substr(0, startOffset) + kText.substr(startOffset + length) + invisibleWhiteSpaces}</p>`,
+      t.name,
+      { ignoreWhiteSpaceDifference: true }
+  );
   if (startOffset === kText.length) {
     checkBeforeinputAndInputEventsOnNOOP();
     return;
diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-non-collapsed-selection.tentative.html b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-non-collapsed-selection.tentative.html
index 2e16d2a4c3a..b8732327dad 100644
--- a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-non-collapsed-selection.tentative.html
+++ b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-non-collapsed-selection.tentative.html
@@ -33,13 +33,16 @@ let insertedHTML = action === "TypingA" ? "a" : "";
 
 // If text node is selected, target range should be shrunken to the edge of
 // text node.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p>");
   let p = gEditor.firstChild;
   let abc = p.firstChild;
   gSelection.setBaseAndExtent(p, 0, p, 1);
   await run();
-  assert_equals(gEditor.innerHTML, `<p>${insertedHTML !== "" ? insertedHTML : "<br>"}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${insertedHTML !== "" ? insertedHTML : "<br>"}</p>`,
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 0,
@@ -49,14 +52,19 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<p>{abc}</p>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc<br></p>");
   let p = gEditor.firstChild;
   let abc = p.firstChild;
   gSelection.setBaseAndExtent(p, 0, p, 1);
   await run();
-  assert_in_array(gEditor.innerHTML, [`<p>${insertedHTML !== "" ? insertedHTML : "<br>"}</p>`,
-                                      `<p>${insertedHTML}<br></p>`]);
+  checkEditorContentResultAsSubTest(
+    [
+      `<p>${insertedHTML !== "" ? insertedHTML : "<br>"}</p>`,
+      `<p>${insertedHTML}<br></p>`,
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 0,
@@ -66,12 +74,15 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<p>{abc}<br></p>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<p><img src="${kImgSrc}"></p>`);
   let p = gEditor.firstChild;
   gSelection.setBaseAndExtent(p, 0, p, 1);
   await run();
-  assert_equals(gEditor.innerHTML, `<p>${insertedHTML !== "" ? insertedHTML : "<br>"}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${insertedHTML !== "" ? insertedHTML : "<br>"}</p>`,
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 0,
@@ -81,13 +92,18 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<p>{<img>}</p>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<p><img src="${kImgSrc}"><br></p>`);
   let p = gEditor.firstChild;
   gSelection.setBaseAndExtent(p, 0, p, 1);
   await run();
-  assert_in_array(gEditor.innerHTML, [`<p>${insertedHTML !== "" ? insertedHTML : "<br>"}</p>`,
-                                      `<p>${insertedHTML}<br></p>`]);
+  checkEditorContentResultAsSubTest(
+    [
+      `<p>${insertedHTML !== "" ? insertedHTML : "<br>"}</p>`,
+      `<p>${insertedHTML}<br></p>`,
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: p,
     startOffset: 0,
@@ -97,13 +113,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<p>{<img>}<br></p>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p> abc </p>");
   let p = gEditor.firstChild;
   let abc = p.firstChild;
   gSelection.setBaseAndExtent(p, 0, p, 1);
   await run();
-  assert_equals(gEditor.innerHTML, `<p>${insertedHTML !== "" ? insertedHTML : "<br>"}</p>`);
+  checkEditorContentResultAsSubTest(
+    `<p>${insertedHTML !== "" ? insertedHTML : "<br>"}</p>`,
+    t.name,
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 0,
@@ -118,7 +137,7 @@ promise_test(async () => {
 // becoming visible when the blocks are joined.  Perhaps, they should be
 // contained by the range of `getTargetRanges()`, but needs discussion.
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc   </p><p>   def</p>");
   let p1 = gEditor.firstChild;
   let abc = p1.firstChild;
@@ -126,7 +145,7 @@ promise_test(async () => {
   let def = p2.firstChild;
   gSelection.setBaseAndExtent(abc, 6, def, 0);
   await run();
-  assert_equals(gEditor.innerHTML, `<p>abc${insertedHTML}def</p>`);
+  checkEditorContentResultAsSubTest(`<p>abc${insertedHTML}def</p>`, t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -136,13 +155,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<p>abc   [</p><p>]   def</p>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p><p>def</p>");
   let abc = gEditor.querySelector("p").firstChild;
   let def = gEditor.querySelector("p + p").firstChild;
   gSelection.setBaseAndExtent(abc, 2, def, 1);
   await run();
-  assert_equals(gEditor.innerHTML, `<p>ab${insertedHTML}ef</p>`);
+  checkEditorContentResultAsSubTest(`<p>ab${insertedHTML}ef</p>`, t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 2,
@@ -152,13 +171,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<p>ab[c</p><p>d]ef</p>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc </p><p> def</p>");
   let abc = gEditor.querySelector("p").firstChild;
   let def = gEditor.querySelector("p + p").firstChild;
   gSelection.setBaseAndExtent(abc, 2, def, 2);
   await run();
-  assert_equals(gEditor.innerHTML, `<p>ab${insertedHTML}ef</p>`);
+  checkEditorContentResultAsSubTest(`<p>ab${insertedHTML}ef</p>`, t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 2,
@@ -168,13 +187,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<p>ab[c </p><p> d]ef</p>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc </p><p> def</p>");
   let abc = gEditor.querySelector("p").firstChild;
   let def = gEditor.querySelector("p + p").firstChild;
   gSelection.setBaseAndExtent(abc, 2, def, 0);
   await run();
-  assert_equals(gEditor.innerHTML, `<p>ab${insertedHTML}def</p>`);
+  checkEditorContentResultAsSubTest(`<p>ab${insertedHTML}def</p>`, t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 2,
@@ -184,13 +203,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<p>ab[c </p><p>] def</p>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc </p><p> def</p>");
   let abc = gEditor.querySelector("p").firstChild;
   let def = gEditor.querySelector("p + p").firstChild;
   gSelection.setBaseAndExtent(abc, 4, def, 0);
   await run();
-  assert_equals(gEditor.innerHTML, `<p>abc${insertedHTML}def</p>`);
+  checkEditorContentResultAsSubTest(`<p>abc${insertedHTML}def</p>`, t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -200,13 +219,13 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<p>abc [</p><p>] def</p>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc </p><p> def</p>");
   let abc = gEditor.querySelector("p").firstChild;
   let def = gEditor.querySelector("p + p").firstChild;
   gSelection.setBaseAndExtent(abc, 4, def, 1);
   await run();
-  assert_equals(gEditor.innerHTML, `<p>abc${insertedHTML}def</p>`);
+  checkEditorContentResultAsSubTest(`<p>abc${insertedHTML}def</p>`, t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -219,14 +238,14 @@ promise_test(async () => {
 // Different from collapsed range around an atomic content, non-collapsed
 // range may not be shrunken to select only the atomic content for avoid
 // to waste runtime cost.
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<p>abc<img src="${kImgSrc}">def</p>`);
   let p = gEditor.querySelector("p");
   let abc = p.firstChild;
   let def = p.lastChild;
   gSelection.setBaseAndExtent(abc, 3, def, 0);
   await run();
-  assert_equals(gEditor.innerHTML, `<p>abc${insertedHTML}def</p>`);
+  checkEditorContentResultAsSubTest(`<p>abc${insertedHTML}def</p>`, t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -236,14 +255,14 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<p>abc[<img>]def</p>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<div>abc<hr>def</div>`);
   let div = gEditor.querySelector("div");
   let abc = div.firstChild;
   let def = div.lastChild;
   gSelection.setBaseAndExtent(abc, 3, def, 0);
   await run();
-  assert_equals(gEditor.innerHTML, `<div>abc${insertedHTML}def</div>`);
+  checkEditorContentResultAsSubTest(`<div>abc${insertedHTML}def</div>`, t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -253,14 +272,14 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<div>abc[<hr>]def</div>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<div>abc <hr>def</div>`);
   let div = gEditor.querySelector("div");
   let abc = div.firstChild;
   let def = div.lastChild;
   gSelection.setBaseAndExtent(abc, 4, def, 0);
   await run();
-  assert_equals(gEditor.innerHTML, `<div>abc${insertedHTML}def</div>`);
+  checkEditorContentResultAsSubTest(`<div>abc${insertedHTML}def</div>`, t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -270,14 +289,14 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<div>abc [<hr>]def</div>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<div>abc <hr> def</div>`);
   let div = gEditor.querySelector("div");
   let abc = div.firstChild;
   let def = div.lastChild;
   gSelection.setBaseAndExtent(abc, 4, def, 0);
   await run();
-  assert_equals(gEditor.innerHTML, `<div>abc${insertedHTML}def</div>`);
+  checkEditorContentResultAsSubTest(`<div>abc${insertedHTML}def</div>`, t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -287,14 +306,14 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<div>abc [<hr>] def</div>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest(`<div>abc <hr> def</div>`);
   let div = gEditor.querySelector("div");
   let abc = div.firstChild;
   let def = div.lastChild;
   gSelection.setBaseAndExtent(div, 1, div, 2);
   await run();
-  assert_equals(gEditor.innerHTML, `<div>abc${insertedHTML}def</div>`);
+  checkEditorContentResultAsSubTest(`<div>abc${insertedHTML}def</div>`, t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -308,11 +327,11 @@ promise_test(async () => {
 // `getTargetRanges()`.  However, when only the `<br>` element is selected,
 // the range shouldn't start from nor end by surrounding text nodes?
 // https://github.com/w3c/input-events/issues/112
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc<br>def</p>");
   gSelection.setBaseAndExtent(gEditor.firstChild, 1, gEditor.firstChild, 2);
   await run();
-  assert_equals(gEditor.innerHTML, `<p>abc${insertedHTML}def</p>`);
+  checkEditorContentResultAsSubTest(`<p>abc${insertedHTML}def</p>`, t.name);
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: gEditor.firstChild,
     startOffset: 1,
@@ -322,15 +341,20 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<p>abc{<br>}def</p>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<p>def<br>ghi</p></div>");
   let p = gEditor.querySelector("p");
   let def = p.firstChild;
   let abc = gEditor.firstChild.firstChild;
   gSelection.setBaseAndExtent(abc, 3, def, 0);
   await run();
-  assert_in_array(gEditor.innerHTML, [`<div>abc${insertedHTML}def<p>ghi</p></div>`,
-                                      `<div>abc${insertedHTML}def<br><p>ghi</p></div>`]);
+  checkEditorContentResultAsSubTest(
+    [
+      `<div>abc${insertedHTML}def<p>ghi</p></div>`,
+      `<div>abc${insertedHTML}def<br><p>ghi</p></div>`,
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -340,15 +364,20 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<div>abc[<p>]def<br>ghi</p></div>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc   <p>   def<br>ghi</p></div>");
   let p = gEditor.querySelector("p");
   let def = p.firstChild;
   let abc = gEditor.firstChild.firstChild;
   gSelection.setBaseAndExtent(abc, abc.length, def, 0);
   await run();
-  assert_in_array(gEditor.innerHTML, [`<div>abc${insertedHTML}def<p>ghi</p></div>`,
-                                      `<div>abc${insertedHTML}def<br><p>ghi</p></div>`]);
+  checkEditorContentResultAsSubTest(
+    [
+      `<div>abc${insertedHTML}def<p>ghi</p></div>`,
+      `<div>abc${insertedHTML}def<br><p>ghi</p></div>`,
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -358,14 +387,19 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<div>abc   [<p>]   def<br>ghi</p></div>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><p>abc</p>def</div>");
   let abc = gEditor.querySelector("p").firstChild;
   let def = gEditor.querySelector("p").nextSibling;
   gSelection.setBaseAndExtent(abc, 3, def, 0);
   await run();
-  assert_in_array(gEditor.innerHTML, [`<div><p>abc${insertedHTML}def</p></div>`,
-                                      `<div><p>abc${insertedHTML}def<br></p></div>`]);
+  checkEditorContentResultAsSubTest(
+    [
+      `<div><p>abc${insertedHTML}def</p></div>`,
+      `<div><p>abc${insertedHTML}def<br></p></div>`,
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -375,14 +409,19 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<div><p>abc[</p>]def</div>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div><p>abc   </p>   def</div>");
   let abc = gEditor.querySelector("p").firstChild;
   let def = gEditor.querySelector("p").nextSibling;
   gSelection.setBaseAndExtent(abc, abc.length, def, 0);
   await run();
-  assert_in_array(gEditor.innerHTML, [`<div><p>abc${insertedHTML}def</p></div>`,
-                                      `<div><p>abc${insertedHTML}def<br></p></div>`]);
+  checkEditorContentResultAsSubTest(
+    [
+      `<div><p>abc${insertedHTML}def</p></div>`,
+      `<div><p>abc${insertedHTML}def<br></p></div>`,
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -392,13 +431,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<div><p>abc   [</p>]   def</div>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li></ul>ghi</div>");
   let abc = gEditor.querySelector("div").firstChild;
   let def = gEditor.querySelector("li").firstChild;
   gSelection.setBaseAndExtent(abc, 3, def, 0);
   await run();
-  assert_equals(gEditor.innerHTML, `<div>abc${insertedHTML}defghi</div>`);
+  checkEditorContentResultAsSubTest(
+    `<div>abc${insertedHTML}defghi</div>`,
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -408,13 +450,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<div>abc[<ul><li>]def</li></ul>ghi</div>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc  <ul><li> def </li></ul>  ghi</div>");
   let abc = gEditor.querySelector("div").firstChild;
   let def = gEditor.querySelector("li").firstChild;
   gSelection.setBaseAndExtent(abc, abc.length, def, 0);
   await run();
-  assert_equals(gEditor.innerHTML, `<div>abc${insertedHTML}defghi</div>`);
+  checkEditorContentResultAsSubTest(
+    `<div>abc${insertedHTML}defghi</div>`,
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -424,13 +469,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<div>abc  [<ul><li>] def </li></ul>  ghi</div>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li></ul>ghi</div>");
   let def = gEditor.querySelector("li").firstChild;
   let ghi = gEditor.querySelector("ul").nextSibling;
   gSelection.setBaseAndExtent(def, 3, ghi, 0);
   await run();
-  assert_equals(gEditor.innerHTML, `<div>abc<ul><li>def${insertedHTML}ghi</li></ul></div>`);
+  checkEditorContentResultAsSubTest(
+    `<div>abc<ul><li>def${insertedHTML}ghi</li></ul></div>`,
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: def,
     startOffset: 3,
@@ -440,15 +488,20 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<div>abc<ul><li>def[</li></ul>]ghi</div>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc <ul><li>  def  </li></ul> ghi</div>");
   let def = gEditor.querySelector("li").firstChild;
   let ghi = gEditor.querySelector("ul").nextSibling;
   gSelection.setBaseAndExtent(def, def.length, ghi, 0);
   await run();
-  assert_in_array(gEditor.innerHTML, [`<div>abc <ul><li>  def${insertedHTML}ghi</li></ul></div>`,
-                                      `<div>abc <ul><li>def${insertedHTML}ghi</li></ul></div>`,
-                                      `<div>abc<ul><li>def${insertedHTML}ghi</li></ul></div>`]);
+  checkEditorContentResultAsSubTest(
+    [
+      `<div>abc <ul><li>  def${insertedHTML}ghi</li></ul></div>`,
+      `<div>abc <ul><li>def${insertedHTML}ghi</li></ul></div>`,
+      `<div>abc<ul><li>def${insertedHTML}ghi</li></ul></div>`,
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: def,
     startOffset: 5,
@@ -458,13 +511,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<div>abc <ul><li>  def  [</li></ul>] ghi</div>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li><li>ghi</li></ul>jkl</div>");
   let abc = gEditor.querySelector("div").firstChild;
   let def = gEditor.querySelector("li").firstChild;
   gSelection.setBaseAndExtent(abc, 3, def, 0);
   await run();
-  assert_equals(gEditor.innerHTML, `<div>abc${insertedHTML}def<ul><li>ghi</li></ul>jkl</div>`);
+  checkEditorContentResultAsSubTest(
+    `<div>abc${insertedHTML}def<ul><li>ghi</li></ul>jkl</div>`,
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -474,15 +530,20 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<div>abc[<ul><li>]def</li><li>ghi</li></ul>jkl</div>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li><li>ghi</li></ul>jkl</div>");
   let abc = gEditor.querySelector("div").firstChild;
   let def = gEditor.querySelector("li").firstChild;
   let ghi = gEditor.querySelector("li + li").firstChild;
   gSelection.setBaseAndExtent(abc, 3, ghi, 0);
   await run();
-  assert_in_array(gEditor.innerHTML, [`<div>abc${insertedHTML}ghijkl</div>`,
-                                      `<div>abc${insertedHTML}ghijkl<br></div>`]);
+  checkEditorContentResultAsSubTest(
+    [
+      `<div>abc${insertedHTML}ghijkl</div>`,
+      `<div>abc${insertedHTML}ghijkl<br></div>`,
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 3,
@@ -492,13 +553,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<div>abc[<ul><li>def</li><li>]ghi</li></ul>jkl</div>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li><li>ghi</li></ul>jkl</div>");
   let def = gEditor.querySelector("li").firstChild;
   let ghi = gEditor.querySelector("li + li").firstChild;
   gSelection.setBaseAndExtent(def, 3, ghi, 0);
   await run();
-  assert_equals(gEditor.innerHTML, `<div>abc<ul><li>def${insertedHTML}ghi</li></ul>jkl</div>`);
+  checkEditorContentResultAsSubTest(
+    `<div>abc<ul><li>def${insertedHTML}ghi</li></ul>jkl</div>`,
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: def,
     startOffset: 3,
@@ -508,13 +572,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<div>abc<ul><li>def[</li><li>]ghi</li></ul>jkl</div>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li><li>ghi</li></ul>jkl</div>");
   let ghi = gEditor.querySelector("li + li").firstChild;
   let jkl = gEditor.querySelector("ul").nextSibling;
   gSelection.setBaseAndExtent(ghi, 3, jkl, 0);
   await run();
-  assert_equals(gEditor.innerHTML, `<div>abc<ul><li>def</li><li>ghi${insertedHTML}jkl</li></ul></div>`);
+  checkEditorContentResultAsSubTest(
+    `<div>abc<ul><li>def</li><li>ghi${insertedHTML}jkl</li></ul></div>`,
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: ghi,
     startOffset: 3,
@@ -524,13 +591,16 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<div>abc<ul><li>def</li><li>ghi[</li></ul>]jkl</div>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<div>abc<ul><li>def</li><li>ghi</li></ul>jkl</div>");
   let def = gEditor.querySelector("li").firstChild;
   let jkl = gEditor.querySelector("ul").nextSibling;
   gSelection.setBaseAndExtent(def, 3, jkl, 0);
   await run();
-  assert_equals(gEditor.innerHTML, `<div>abc<ul><li>def${insertedHTML}jkl</li></ul></div>`);
+  checkEditorContentResultAsSubTest(
+    `<div>abc<ul><li>def${insertedHTML}jkl</li></ul></div>`,
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: def,
     startOffset: 3,
@@ -540,15 +610,20 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<div>abc<ul><li>def[</li><li>ghi</li></ul>]jkl</div>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc</p><p><br></p>");
   let p1 = gEditor.querySelector("p");
   let abc = p1.firstChild;
   let p2 = p1.nextSibling;
   gSelection.setBaseAndExtent(abc, 3, p2, 0);
   await run();
-  assert_in_array(gEditor.innerHTML, [`<p>abc${insertedHTML}</p>`,
-                                      `<p>abc${insertedHTML}<br></p>`]);
+  checkEditorContentResultAsSubTest(
+    [
+      `<p>abc${insertedHTML}</p>`,
+      `<p>abc${insertedHTML}<br></p>`,
+    ],
+    t.name
+  );
   if (gEditor.innerHTML === "<p>abc</p>") {
     // Include the invisible `<br>` element if it's deleted.
     checkGetTargetRangesOfBeforeinputOnDeleteSomething({
@@ -568,16 +643,21 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<p>abc[</p><p>}<br></p>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<p>abc<span contenteditable=\"false\">def</span>ghi</p>");
   let p = gEditor.querySelector("p");
   let abc = p.firstChild;
   let ghi = p.lastChild;
   gSelection.setBaseAndExtent(abc, 3, ghi, 0);
   await run();
-  assert_in_array(gEditor.innerHTML, ["<p>abc<span contenteditable=\"false\">def</span>ghi</p>",
-                                      `<p>abc${insertedHTML}ghi</p>`,
-                                      `<p>abc${insertedHTML}ghi<br></p>`]);
+  checkEditorContentResultAsSubTest(
+    [
+      "<p>abc<span contenteditable=\"false\">def</span>ghi</p>",
+      `<p>abc${insertedHTML}ghi</p>`,
+      `<p>abc${insertedHTML}ghi<br></p>`,
+    ],
+    t.name
+  );
   // Don't need to shrink the range for avoiding to waste runtime cost.
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
@@ -595,13 +675,16 @@ promise_test(async () => {
 // The table structure shouldn't be modified when deleting cell contents,
 // in this case, getTargetRanges() should return multiple ranges in each
 // cell?
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>abc</td><td>def</td></tr></table>");
   let abc = gEditor.querySelector("td").firstChild;
   let def = gEditor.querySelector("td + td").firstChild;
   gSelection.setBaseAndExtent(abc, 2, def, 1);
   await run();
-  assert_equals(gEditor.innerHTML, `<table><tbody><tr><td>ab${insertedHTML}</td><td>ef</td></tr></tbody></table>`);
+  checkEditorContentResultAsSubTest(
+    `<table><tbody><tr><td>ab${insertedHTML}</td><td>ef</td></tr></tbody></table>`,
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 2,
@@ -611,14 +694,19 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<table><tr><td>ab[c</td><td>d]ef</td></tr></table>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>abc</td><td>def</td></tr><tr><td>ghi</td><td>jkl</td></tr></table>");
   let abc = gEditor.querySelector("td").firstChild;
   let jkl = gEditor.querySelector("tr + tr > td + td").firstChild;
   gSelection.setBaseAndExtent(abc, 2, jkl, 1);
   await run();
-  assert_in_array(gEditor.innerHTML, [`<table><tbody><tr><td>ab${insertedHTML}</td><td></td></tr><tr><td></td><td>kl</td></tr></tbody></table>`,
-                                      `<table><tbody><tr><td>ab${insertedHTML}</td><td><br></td></tr><tr><td><br></td><td>kl</td></tr></tbody></table>`]);
+  checkEditorContentResultAsSubTest(
+    [
+      `<table><tbody><tr><td>ab${insertedHTML}</td><td></td></tr><tr><td></td><td>kl</td></tr></tbody></table>`,
+      `<table><tbody><tr><td>ab${insertedHTML}</td><td><br></td></tr><tr><td><br></td><td>kl</td></tr></tbody></table>`,
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 2,
@@ -628,14 +716,19 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDeleteSomething();
 }, `${action} at "<table><tr><td>ab[c</td><td>def</td></tr><tr><td>ghi</td><td>j]kl</td></tr></table>"`);
 
-promise_test(async () => {
+promise_test(async (t) => {
   initializeTest("<table><tr><td>abc</td><td>def</td></tr></table><table><tr><td>ghi</td><td>jkl</td></tr></table>");
   let abc = gEditor.querySelector("td").firstChild;
   let jkl = gEditor.querySelector("table + table td + td").firstChild;
   gSelection.setBaseAndExtent(abc, 2, jkl, 1);
   await run();
-  assert_in_array(gEditor.innerHTML, [`<table><tbody><tr><td>ab${insertedHTML}</td><td></td></tr></tbody></table><table><tbody><tr><td></td><td>kl</td></tr></tbody></table>`,
-                                      `<table><tbody><tr><td>ab${insertedHTML}</td><td><br></td></tr></tbody></table><table><tbody><tr><td><br></td><td>kl</td></tr></tbody></table>`]);
+  checkEditorContentResultAsSubTest(
+    [
+      `<table><tbody><tr><td>ab${insertedHTML}</td><td></td></tr></tbody></table><table><tbody><tr><td></td><td>kl</td></tr></tbody></table>`,
+      `<table><tbody><tr><td>ab${insertedHTML}</td><td><br></td></tr></tbody></table><table><tbody><tr><td><br></td><td>kl</td></tr></tbody></table>`,
+    ],
+    t.name
+  );
   checkGetTargetRangesOfBeforeinputOnDeleteSomething({
     startContainer: abc,
     startOffset: 2,
diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges.js b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges.js
index a957678c50f..6b922cdf039 100644
--- a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges.js
+++ b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges.js
@@ -227,3 +227,27 @@ function checkBeforeinputAndInputEventsOnNOOP() {
     "input event shouldn't be fired when the key operation does not cause modifying the DOM tree"
   );
 }
+
+function checkEditorContentResultAsSubTest(
+  expectedResult,
+  description,
+  options = {}
+) {
+  test(() => {
+    if (Array.isArray(expectedResult)) {
+      assert_in_array(
+        options.ignoreWhiteSpaceDifference
+          ? gEditor.innerHTML.replace(/&nbsp;/g, " ")
+          : gEditor.innerHTML,
+        expectedResult
+      );
+    } else {
+      assert_equals(
+        options.ignoreWhiteSpaceDifference
+          ? gEditor.innerHTML.replace(/&nbsp;/g, " ")
+          : gEditor.innerHTML,
+        expectedResult
+      );
+    }
+  }, `${description} - comparing innerHTML`);
+}
diff --git a/tests/wpt/web-platform-tests/interfaces/WebCryptoAPI.idl b/tests/wpt/web-platform-tests/interfaces/WebCryptoAPI.idl
index 246c1547bb9..d7fce62d5b0 100644
--- a/tests/wpt/web-platform-tests/interfaces/WebCryptoAPI.idl
+++ b/tests/wpt/web-platform-tests/interfaces/WebCryptoAPI.idl
@@ -130,143 +130,102 @@ dictionary CryptoKeyPair {
 };
 
 dictionary RsaKeyGenParams : Algorithm {
-  // The length, in bits, of the RSA modulus
   required [EnforceRange] unsigned long modulusLength;
-  // The RSA public exponent
   required BigInteger publicExponent;
 };
 
 dictionary RsaHashedKeyGenParams : RsaKeyGenParams {
-  // The hash algorithm to use
   required HashAlgorithmIdentifier hash;
 };
 
 dictionary RsaKeyAlgorithm : KeyAlgorithm {
-  // The length, in bits, of the RSA modulus
   required unsigned long modulusLength;
-  // The RSA public exponent
   required BigInteger publicExponent;
 };
 
 dictionary RsaHashedKeyAlgorithm : RsaKeyAlgorithm {
-  // The hash algorithm that is used with this key
   required KeyAlgorithm hash;
 };
 
 dictionary RsaHashedImportParams : Algorithm {
-  // The hash algorithm to use
   required HashAlgorithmIdentifier hash;
 };
 
 dictionary RsaPssParams : Algorithm {
-  // The desired length of the random salt
   required [EnforceRange] unsigned long saltLength;
 };
 
 dictionary RsaOaepParams : Algorithm {
-  // The optional label/application data to associate with the message
   BufferSource label;
 };
 
 dictionary EcdsaParams : Algorithm {
-  // The hash algorithm to use
   required HashAlgorithmIdentifier hash;
 };
 
 typedef DOMString NamedCurve;
 
 dictionary EcKeyGenParams : Algorithm {
-  // A named curve
   required NamedCurve namedCurve;
 };
 
 dictionary EcKeyAlgorithm : KeyAlgorithm {
-  // The named curve that the key uses
   required NamedCurve namedCurve;
 };
 
 dictionary EcKeyImportParams : Algorithm {
-  // A named curve
   required NamedCurve namedCurve;
 };
 
 dictionary EcdhKeyDeriveParams : Algorithm {
-  // The peer's EC public key.
   required CryptoKey public;
 };
 
 dictionary AesCtrParams : Algorithm {
-  // The initial value of the counter block. counter MUST be 16 bytes
-  // (the AES block size). The counter bits are the rightmost length
-  // bits of the counter block. The rest of the counter block is for
-  // the nonce. The counter bits are incremented using the standard
-  // incrementing function specified in NIST SP 800-38A Appendix B.1:
-  // the counter bits are interpreted as a big-endian integer and
-  // incremented by one.
   required BufferSource counter;
-  // The length, in bits, of the rightmost part of the counter block
-  // that is incremented.
   required [EnforceRange] octet length;
 };
 
 dictionary AesKeyAlgorithm : KeyAlgorithm {
-  // The length, in bits, of the key.
   required unsigned short length;
 };
 
 dictionary AesKeyGenParams : Algorithm {
-  // The length, in bits, of the key.
   required [EnforceRange] unsigned short length;
 };
 
 dictionary AesDerivedKeyParams : Algorithm {
-  // The length, in bits, of the key.
   required [EnforceRange] unsigned short length;
 };
 
 dictionary AesCbcParams : Algorithm {
-  // The initialization vector. MUST be 16 bytes.
   required BufferSource iv;
 };
 
 dictionary AesGcmParams : Algorithm {
-  // The initialization vector to use. May be up to 2^64-1 bytes long.
   required BufferSource iv;
-  // The additional authentication data to include.
   BufferSource additionalData;
-  // The desired length of the authentication tag. May be 0 - 128.
   [EnforceRange] octet tagLength;
 };
 
 dictionary HmacImportParams : Algorithm {
-  // The inner hash function to use.
   required HashAlgorithmIdentifier hash;
-  // The length (in bits) of the key.
   [EnforceRange] unsigned long length;
 };
 
 dictionary HmacKeyAlgorithm : KeyAlgorithm {
-  // The inner hash function to use.
   required KeyAlgorithm hash;
-  // The length (in bits) of the key.
   required unsigned long length;
 };
 
 dictionary HmacKeyGenParams : Algorithm {
-  // The inner hash function to use.
   required HashAlgorithmIdentifier hash;
-  // The length (in bits) of the key to generate. If unspecified, the
-  // recommended length will be used, which is the size of the associated hash function's block
-  // size.
   [EnforceRange] unsigned long length;
 };
 
 dictionary HkdfParams : Algorithm {
-  // The algorithm to use with HMAC (e.g.: SHA-256)
   required HashAlgorithmIdentifier hash;
-  // A bit string that corresponds to the salt used in the extract step.
   required BufferSource salt;
-  // A bit string that corresponds to the context and application specific context for the derived keying material.
   required BufferSource info;
 };
 
diff --git a/tests/wpt/web-platform-tests/interfaces/dom.idl b/tests/wpt/web-platform-tests/interfaces/dom.idl
index ffc5b063219..d404be2aea5 100644
--- a/tests/wpt/web-platform-tests/interfaces/dom.idl
+++ b/tests/wpt/web-platform-tests/interfaces/dom.idl
@@ -9,7 +9,7 @@ interface Event {
 
   readonly attribute DOMString type;
   readonly attribute EventTarget? target;
-  readonly attribute EventTarget? srcElement; // historical
+  readonly attribute EventTarget? srcElement; // legacy
   readonly attribute EventTarget? currentTarget;
   sequence<EventTarget> composedPath();
 
@@ -20,12 +20,12 @@ interface Event {
   readonly attribute unsigned short eventPhase;
 
   undefined stopPropagation();
-           attribute boolean cancelBubble; // historical alias of .stopPropagation
+           attribute boolean cancelBubble; // legacy alias of .stopPropagation()
   undefined stopImmediatePropagation();
 
   readonly attribute boolean bubbles;
   readonly attribute boolean cancelable;
-           attribute boolean returnValue;  // historical
+           attribute boolean returnValue;  // legacy
   undefined preventDefault();
   readonly attribute boolean defaultPrevented;
   readonly attribute boolean composed;
@@ -33,7 +33,7 @@ interface Event {
   [LegacyUnforgeable] readonly attribute boolean isTrusted;
   readonly attribute DOMHighResTimeStamp timeStamp;
 
-  undefined initEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false); // historical
+  undefined initEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false); // legacy
 };
 
 dictionary EventInit {
@@ -43,7 +43,7 @@ dictionary EventInit {
 };
 
 partial interface Window {
-  [Replaceable] readonly attribute any event; // historical
+  [Replaceable] readonly attribute any event; // legacy
 };
 
 [Exposed=(Window,Worker)]
@@ -52,7 +52,7 @@ interface CustomEvent : Event {
 
   readonly attribute any detail;
 
-  undefined initCustomEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false, optional any detail = null); // historical
+  undefined initCustomEvent(DOMString type, optional boolean bubbles = false, optional boolean cancelable = false, optional any detail = null); // legacy
 };
 
 dictionary CustomEventInit : EventInit {
@@ -201,14 +201,14 @@ interface Node : EventTarget {
   const unsigned short ATTRIBUTE_NODE = 2;
   const unsigned short TEXT_NODE = 3;
   const unsigned short CDATA_SECTION_NODE = 4;
-  const unsigned short ENTITY_REFERENCE_NODE = 5; // historical
-  const unsigned short ENTITY_NODE = 6; // historical
+  const unsigned short ENTITY_REFERENCE_NODE = 5; // legacy
+  const unsigned short ENTITY_NODE = 6; // legacy
   const unsigned short PROCESSING_INSTRUCTION_NODE = 7;
   const unsigned short COMMENT_NODE = 8;
   const unsigned short DOCUMENT_NODE = 9;
   const unsigned short DOCUMENT_TYPE_NODE = 10;
   const unsigned short DOCUMENT_FRAGMENT_NODE = 11;
-  const unsigned short NOTATION_NODE = 12; // historical
+  const unsigned short NOTATION_NODE = 12; // legacy
   readonly attribute unsigned short nodeType;
   readonly attribute DOMString nodeName;
 
@@ -232,7 +232,7 @@ interface Node : EventTarget {
 
   [CEReactions, NewObject] Node cloneNode(optional boolean deep = false);
   boolean isEqualNode(Node? otherNode);
-  boolean isSameNode(Node? otherNode); // historical alias of ===
+  boolean isSameNode(Node? otherNode); // legacy alias of ===
 
   const unsigned short DOCUMENT_POSITION_DISCONNECTED = 0x01;
   const unsigned short DOCUMENT_POSITION_PRECEDING = 0x02;
@@ -266,8 +266,8 @@ interface Document : Node {
   readonly attribute USVString documentURI;
   readonly attribute DOMString compatMode;
   readonly attribute DOMString characterSet;
-  readonly attribute DOMString charset; // historical alias of .characterSet
-  readonly attribute DOMString inputEncoding; // historical alias of .characterSet
+  readonly attribute DOMString charset; // legacy alias of .characterSet
+  readonly attribute DOMString inputEncoding; // legacy alias of .characterSet
   readonly attribute DOMString contentType;
 
   readonly attribute DocumentType? doctype;
@@ -290,7 +290,7 @@ interface Document : Node {
   [NewObject] Attr createAttribute(DOMString localName);
   [NewObject] Attr createAttributeNS(DOMString? namespace, DOMString qualifiedName);
 
-  [NewObject] Event createEvent(DOMString interface); // historical
+  [NewObject] Event createEvent(DOMString interface); // legacy
 
   [NewObject] Range createRange();
 
@@ -372,14 +372,14 @@ interface Element : Node {
 
   Element? closest(DOMString selectors);
   boolean matches(DOMString selectors);
-  boolean webkitMatchesSelector(DOMString selectors); // historical alias of .matches
+  boolean webkitMatchesSelector(DOMString selectors); // legacy alias of .matches
 
   HTMLCollection getElementsByTagName(DOMString qualifiedName);
   HTMLCollection getElementsByTagNameNS(DOMString? namespace, DOMString localName);
   HTMLCollection getElementsByClassName(DOMString classNames);
 
-  [CEReactions] Element? insertAdjacentElement(DOMString where, Element element); // historical
-  undefined insertAdjacentText(DOMString where, DOMString data); // historical
+  [CEReactions] Element? insertAdjacentElement(DOMString where, Element element); // legacy
+  undefined insertAdjacentText(DOMString where, DOMString data); // legacy
 };
 
 dictionary ShadowRootInit {
@@ -545,14 +545,14 @@ callback interface NodeFilter {
   const unsigned long SHOW_ATTRIBUTE = 0x2;
   const unsigned long SHOW_TEXT = 0x4;
   const unsigned long SHOW_CDATA_SECTION = 0x8;
-  const unsigned long SHOW_ENTITY_REFERENCE = 0x10; // historical
-  const unsigned long SHOW_ENTITY = 0x20; // historical
+  const unsigned long SHOW_ENTITY_REFERENCE = 0x10; // legacy
+  const unsigned long SHOW_ENTITY = 0x20; // legacy
   const unsigned long SHOW_PROCESSING_INSTRUCTION = 0x40;
   const unsigned long SHOW_COMMENT = 0x80;
   const unsigned long SHOW_DOCUMENT = 0x100;
   const unsigned long SHOW_DOCUMENT_TYPE = 0x200;
   const unsigned long SHOW_DOCUMENT_FRAGMENT = 0x400;
-  const unsigned long SHOW_NOTATION = 0x800; // historical
+  const unsigned long SHOW_NOTATION = 0x800; // legacy
 
   unsigned short acceptNode(Node node);
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl b/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl
index 3ef9f545290..efa986d93e3 100644
--- a/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl
+++ b/tests/wpt/web-platform-tests/interfaces/scroll-animations.idl
@@ -16,7 +16,7 @@ typedef (CSSNumericValue or CSSKeywordish) ContainerBasedOffset;
 typedef (ContainerBasedOffset or ElementBasedOffset) ScrollTimelineOffset;
 
 dictionary ScrollTimelineOptions {
-  Element? source = null;
+  Element? source;
   ScrollDirection orientation = "block";
   ScrollTimelineOffset start = "auto";
   ScrollTimelineOffset end = "auto";
diff --git a/tests/wpt/web-platform-tests/lint.ignore b/tests/wpt/web-platform-tests/lint.ignore
index 2d0508fd9ba..07c6fb7b85c 100644
--- a/tests/wpt/web-platform-tests/lint.ignore
+++ b/tests/wpt/web-platform-tests/lint.ignore
@@ -692,7 +692,7 @@ MISSING-LINK: css/geometry/*.any.js
 MISSING-LINK: css/filter-effects/*.any.js
 
 # Tests that use WebKit/Blink testing APIs
-LAYOUTTESTS APIS: import-maps/common/resources/common-test-helper-iframe.js
+LAYOUTTESTS APIS: import-maps/data-driven/resources/test-helper-iframe.js
 LAYOUTTESTS APIS: resources/chromium/enable-hyperlink-auditing.js
 LAYOUTTESTS APIS: resources/chromium/generic_sensor_mocks.js
 LAYOUTTESTS APIS: resources/chromium/webxr-test.js
diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-destroy-script-execution.html b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-destroy-script-execution.html
index 1710d238b6e..6375004d36b 100644
--- a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-destroy-script-execution.html
+++ b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-destroy-script-execution.html
@@ -15,7 +15,7 @@
     var testForAllTrackEnded = async_test('MediaRecorder will not fire the stop event when all tracks are ended and the script execution context is going away');
 
     iframeForCallingStop.onload = function(e) {
-        subFrameStop.window.prepareForTest();
+        subFrameStop.window.prepareForTest(testForCallingStop);
         const recorder = subFrameStop.window.recorder;
         recorder.ondataavailable = testForCallingStop.step_func(blobEvent => {
             iframeForCallingStop.remove();
@@ -24,12 +24,12 @@
         recorder.onstop = testForCallingStop.unreached_func('Unexpected stop event');
         recorder.start();
         assert_equals(recorder.state, 'recording', 'MediaRecorder has been started successfully');
-        subFrameStop.window.drawSomethingOnCanvas();
+        subFrameStop.window.control.addVideoFrame();
         recorder.stop();
     };
 
     iframeForAllTrackEnded.onload = function(e) {
-        subFrameAllTrackEnded.window.prepareForTest();
+        subFrameAllTrackEnded.window.prepareForTest(testForAllTrackEnded);
         const recorder = subFrameAllTrackEnded.window.recorder;
         recorder.ondataavailable = testForAllTrackEnded.step_func(blobEvent => {
             iframeForAllTrackEnded.remove();
@@ -38,10 +38,10 @@
         recorder.onstop = testForAllTrackEnded.unreached_func('Unexpected stop event');
         recorder.start();
         assert_equals(recorder.state, 'recording', 'MediaRecorder has been started successfully');
-        subFrameAllTrackEnded.window.drawSomethingOnCanvas();
+        subFrameAllTrackEnded.window.control.addVideoFrame();
         subFrameAllTrackEnded.window.video.getVideoTracks()[0].stop();
     };
 
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-error.html b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-error.html
index 1c93ed3e3a6..54e83ecac76 100644
--- a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-error.html
+++ b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-error.html
@@ -5,37 +5,14 @@
     <link rel="help" href="https://w3c.github.io/mediacapture-record/MediaRecorder.html#mediarecorder">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
+    <script src="utils/sources.js"></script>
 </head>
 <body>
-<canvas id="canvas" width="320" height="320">
-</canvas>
 <script>
-    function createAudioStream() {
-        let ac = new AudioContext();
-        let osc = ac.createOscillator();
-        let dest = ac.createMediaStreamDestination();
-        osc.connect(dest);
-        return dest.stream;
-    }
-
-    function createVideoStream() {
-        let canvas = document.getElementById("canvas");
-        canvas.getContext('2d').lineTo(10, 10);
-        return canvas.captureStream();
-    }
-
-    function drawSomethingOnCanvas() {
-        let canvas = document.getElementById("canvas");
-        // Drawing something on the canvas generates a frame in its captured stream.
-        let context = canvas.getContext("2d");
-        context.fillStyle = "red";
-        context.fillRect(0, 0, 10, 10);
-    }
-
     async_test(t => {
-        let video = createVideoStream();
-        let audio = createAudioStream();
-        let recorder = new MediaRecorder(video);
+        const {stream: video, control} = createVideoStream(t);
+        const {stream: audio} = createAudioStream(t);
+        const recorder = new MediaRecorder(video);
         recorder.onerror = t.step_func(mediaRecorderErrorEvent => {
             assert_true(mediaRecorderErrorEvent instanceof MediaRecorderErrorEvent, 'the type of event should be MediaRecorderErrorEvent');
             assert_equals(mediaRecorderErrorEvent.error.name, 'InvalidModificationError', 'the type of error should be InvalidModificationError when track has been added or removed');
@@ -46,15 +23,15 @@
         recorder.start();
         assert_equals(recorder.state, "recording", "MediaRecorder has been started successfully");
         video.addTrack(audio.getAudioTracks()[0]);
-        drawSomethingOnCanvas();
+        control.addVideoFrame();
         t.step_timeout(() => {
             assert_unreached("error event is not fired after 2 seconds");
         }, 2000);
     }, "MediaRecorder will stop recording when any of track is added and error event will be fired");
 
     async_test(t => {
-        let video = createVideoStream();
-        let recorder = new MediaRecorder(video);
+      const {stream: video, control} = createVideoStream(t);
+        const recorder = new MediaRecorder(video);
         recorder.onerror = t.step_func(mediaRecorderErrorEvent => {
             assert_true(mediaRecorderErrorEvent instanceof MediaRecorderErrorEvent, 'the type of event should be MediaRecorderErrorEvent');
             assert_equals(mediaRecorderErrorEvent.error.name, 'InvalidModificationError', 'the type of error should be InvalidModificationError when track has been added or removed');
@@ -65,15 +42,15 @@
         recorder.start();
         assert_equals(recorder.state, "recording", "MediaRecorder has been started successfully");
         video.removeTrack(video.getVideoTracks()[0]);
-        drawSomethingOnCanvas();
+        control.addVideoFrame();
         t.step_timeout(() => {
             assert_unreached("error event is not fired after 2 seconds");
         }, 2000);
     }, "MediaRecorder will stop recording when any of track is removed and error event will be fired");
 
     test(t => {
-        let video = createVideoStream();
-        let recorder = new MediaRecorder(video);
+        const {stream: video} = createVideoStream(t);
+        const recorder = new MediaRecorder(video);
         recorder.start();
         assert_equals(recorder.state, "recording", "MediaRecorder has been started successfully");
         assert_throws_dom("InvalidStateError", function() {
diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-events-and-exceptions.html b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-events-and-exceptions.html
index d5abf3a05c3..0a377991ba0 100644
--- a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-events-and-exceptions.html
+++ b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-events-and-exceptions.html
@@ -5,9 +5,9 @@
     <link rel="help" href="https://w3c.github.io/mediacapture-record/MediaRecorder.html#mediarecorder">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
+    <script src="utils/sources.js"></script>
 </head>
 <body>
-<canvas id="canvas" width="320" height="320"></canvas>
 <script>
 
   // This test exercises the MediaRecorder API event sequence:
@@ -15,20 +15,6 @@
   // verifying the |state| and a few exceptions that are supposed to be thrown
   // when doing the wrong thing.
 
-  function createVideoStream() {
-      let canvas = document.getElementById("canvas");
-      canvas.getContext('2d').lineTo(10, 10);
-      return canvas.captureStream();
-  }
-
-  function drawSomethingOnCanvas() {
-      let canvas = document.getElementById("canvas");
-      // Drawing something on the canvas generates a frame in its captured stream.
-      let context = canvas.getContext("2d");
-      context.fillStyle = "red";
-      context.fillRect(0, 0, 10, 10);
-  }
-
   async_test(test => {
 
     recorderOnUnexpectedEvent = test.step_func(() => {
@@ -75,18 +61,18 @@
       recorder.pause();
     });
 
-    let stream = createVideoStream();
+    const {stream, control} = createVideoStream(test);
     assert_equals(stream.getAudioTracks().length, 0);
     assert_equals(stream.getVideoTracks().length, 1);
     assert_equals(stream.getVideoTracks()[0].readyState, 'live');
 
     assert_throws_dom("NotSupportedError",
                       function() {
-                        recorder = new MediaRecorder(
+                        new MediaRecorder(
                           new MediaStream(), {mimeType : "video/invalid"});
                       },
                       "recorder should throw() with unsupported mimeType");
-    let recorder = new MediaRecorder(new MediaStream());
+    const recorder = new MediaRecorder(new MediaStream());
     assert_equals(recorder.state, "inactive");
 
     recorder.stop();
@@ -106,7 +92,7 @@
 
     recorder.stream.addTrack(stream.getTracks()[0]);
 
-    drawSomethingOnCanvas();
+    control.addVideoFrame();
 
     recorder.onstop = recorderOnUnexpectedEvent;
     recorder.onpause = recorderOnUnexpectedEvent;
diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-mimetype.html b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-mimetype.html
index 8b98977dda2..07721abfd42 100644
--- a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-mimetype.html
+++ b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-mimetype.html
@@ -5,60 +5,24 @@
   <link rel="help" href="https://w3c.github.io/mediacapture-record/MediaRecorder.html#dom-mediarecorder-mimeType">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
+  <script src="utils/sources.js"></script>
 </head>
 <body>
-<canvas id="canvas" width="200" height="200">
-</canvas>
 <script>
-function createAudioStream(t) {
-  const ac = new AudioContext();
-  const dest = ac.createMediaStreamDestination();
-  const osc = ac.createOscillator();
-  osc.connect(dest);
-  osc.start();
-  const [track] = dest.stream.getTracks();
-  t.add_cleanup(() => track.stop());
-  return dest.stream;
-}
-
-function createVideoStream(t) {
-  const canvas = document.getElementById("canvas");
-  const ctx = canvas.getContext('2d');
-  const stream = canvas.captureStream();
-  const [track] = stream.getTracks();
-  t.add_cleanup(() => track.stop());
-  ctx.fillStyle = 'green';
-  requestAnimationFrame(function draw() {
-    ctx.fillRect(0, 0, canvas.width, canvas.height);
-    if (track.readyState == "live") {
-      requestAnimationFrame(draw);
-    }
-  });
-  return stream;
-}
-
-function createAudioVideoStream(t) {
-  return new MediaStream([
-      ...createAudioStream(t).getTracks(),
-      ...createVideoStream(t).getTracks(),
-    ]);
-}
-
 test(t => {
-  const recorder = new MediaRecorder(createAudioStream(t));
+  const recorder = new MediaRecorder(createAudioStream(t).stream);
   assert_equals(recorder.mimeType, "",
     "MediaRecorder has no default mimeType");
 }, "MediaRecorder sets no default mimeType in the constructor for audio");
 
 test(t => {
-  const recorder = new MediaRecorder(createVideoStream(t));
+  const recorder = new MediaRecorder(createVideoStream(t).stream);
   assert_equals(recorder.mimeType, "",
     "MediaRecorder has no default mimeType");
 }, "MediaRecorder sets no default mimeType in the constructor for video");
 
 test(t => {
-  const stream = createAudioVideoStream(t);
-  const recorder = new MediaRecorder(stream);
+  const recorder = new MediaRecorder(createAudioVideoStream(t).stream);
   assert_equals(recorder.mimeType, "",
     "MediaRecorder has no default mimeType");
 }, "MediaRecorder sets no default mimeType in the constructor for audio/video");
@@ -115,46 +79,46 @@ for (const mimeType of [
 }
 
 promise_test(async t => {
-  const recorder = new MediaRecorder(createAudioStream(t));
+  const recorder = new MediaRecorder(createFlowingAudioStream(t).stream);
   recorder.start();
   await new Promise(r => recorder.onstart = r);
   assert_not_equals(recorder.mimeType, "");
 }, "MediaRecorder sets a nonempty mimeType on 'onstart' for audio");
 
 promise_test(async t => {
-  const recorder = new MediaRecorder(createVideoStream(t));
+  const recorder = new MediaRecorder(createFlowingVideoStream(t).stream);
   recorder.start();
   await new Promise(r => recorder.onstart = r);
   assert_not_equals(recorder.mimeType, "");
 }, "MediaRecorder sets a nonempty mimeType on 'onstart' for video");
 
 promise_test(async t => {
-  const recorder = new MediaRecorder(createAudioVideoStream(t));
+  const recorder = new MediaRecorder(createFlowingAudioVideoStream(t).stream);
   recorder.start();
   await new Promise(r => recorder.onstart = r);
   assert_not_equals(recorder.mimeType, "");
 }, "MediaRecorder sets a nonempty mimeType on 'onstart' for audio/video");
 
 promise_test(async t => {
-  const recorder = new MediaRecorder(createAudioStream(t));
+  const recorder = new MediaRecorder(createFlowingAudioStream(t).stream);
   recorder.start();
   assert_equals(recorder.mimeType, "");
 }, "MediaRecorder mimeType is not set before 'onstart' for audio");
 
 promise_test(async t => {
-  const recorder = new MediaRecorder(createVideoStream(t));
+  const recorder = new MediaRecorder(createFlowingVideoStream(t).stream);
   recorder.start();
   assert_equals(recorder.mimeType, "");
 }, "MediaRecorder mimeType is not set before 'onstart' for video");
 
 promise_test(async t => {
-  const recorder = new MediaRecorder(createAudioVideoStream(t));
+  const recorder = new MediaRecorder(createFlowingAudioVideoStream(t).stream);
   recorder.start();
   assert_equals(recorder.mimeType, "");
 }, "MediaRecorder mimeType is not set before 'onstart' for audio/video");
 
 promise_test(async t => {
-  const recorder = new MediaRecorder(createAudioStream(t));
+  const recorder = new MediaRecorder(createFlowingAudioStream(t).stream);
   const onstartPromise = new Promise(resolve => {
     recorder.onstart = () => {
       recorder.onstart = () => t.step_func(() => {
@@ -169,7 +133,7 @@ promise_test(async t => {
 }, "MediaRecorder doesn't fire 'onstart' multiple times for audio");
 
 promise_test(async t => {
-  const recorder = new MediaRecorder(createVideoStream(t));
+  const recorder = new MediaRecorder(createFlowingVideoStream(t).stream);
   const onstartPromise = new Promise(resolve => {
     recorder.onstart = () => {
       recorder.onstart = () => t.step_func(() => {
@@ -184,7 +148,7 @@ promise_test(async t => {
 }, "MediaRecorder doesn't fire 'onstart' multiple times for video");
 
 promise_test(async t => {
-  const recorder = new MediaRecorder(createAudioVideoStream(t));
+  const recorder = new MediaRecorder(createFlowingAudioVideoStream(t).stream);
   const onstartPromise = new Promise(resolve => {
     recorder.onstart = () => {
       recorder.onstart = () => t.step_func(() => {
@@ -199,7 +163,7 @@ promise_test(async t => {
 }, "MediaRecorder doesn't fire 'onstart' multiple times for audio/video");
 
 promise_test(async t => {
-  const recorder = new MediaRecorder(createAudioStream(t));
+  const recorder = new MediaRecorder(createFlowingAudioStream(t).stream);
   recorder.start();
   await new Promise(r => recorder.onstart = r);
   assert_regexp_match(recorder.mimeType, /^audio\//,
@@ -212,7 +176,7 @@ promise_test(async t => {
 }, "MediaRecorder formats mimeType well after 'start' for audio");
 
 promise_test(async t => {
-  const recorder = new MediaRecorder(createVideoStream(t));
+  const recorder = new MediaRecorder(createFlowingVideoStream(t).stream);
   recorder.start();
   await new Promise(r => recorder.onstart = r);
   assert_regexp_match(recorder.mimeType, /^video\//,
@@ -225,7 +189,7 @@ promise_test(async t => {
 }, "MediaRecorder formats mimeType well after 'start' for video");
 
 promise_test(async t => {
-  const recorder = new MediaRecorder(createAudioVideoStream(t));
+  const recorder = new MediaRecorder(createFlowingAudioVideoStream(t).stream);
   recorder.start();
   await new Promise(r => recorder.onstart = r);
   assert_regexp_match(recorder.mimeType, /^video\//,
diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-pause-resume.html b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-pause-resume.html
index 33dfd8560c0..39f98cc85a1 100644
--- a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-pause-resume.html
+++ b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-pause-resume.html
@@ -5,19 +5,10 @@
     <link rel="help" href="https://w3c.github.io/mediacapture-record/MediaRecorder.html#mediarecorder">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
+    <script src="utils/sources.js"></script>
 </head>
 <body>
-<canvas id="canvas" width="200" height="200">
-</canvas>
 <script>
-    function createVideoStream() {
-        const canvas = document.getElementById("canvas");
-        const ctx = canvas.getContext('2d');
-        ctx.fillStyle = 'green';
-        ctx.fillRect(0, 0, canvas.width, canvas.height);
-        return canvas.captureStream();
-    }
-
     function recordEvents(target, events) {
         let arr = [];
         for (let ev of events) {
@@ -26,10 +17,11 @@
         return arr;
     }
 
-    promise_test(async () => {
-        let video = createVideoStream();
-        let recorder = new MediaRecorder(video);
-        let events = recordEvents(recorder,
+    promise_test(async t => {
+        const {stream: video, control} = createVideoStream(t);
+        control.addVideoFrame();
+        const recorder = new MediaRecorder(video);
+        const events = recordEvents(recorder,
             ["start", "stop", "dataavailable", "pause", "resume", "error"]);
 
         recorder.start();
diff --git a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-stop.html b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-stop.html
index 7e19bc0c054..73eb2999adb 100644
--- a/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-stop.html
+++ b/tests/wpt/web-platform-tests/mediacapture-record/MediaRecorder-stop.html
@@ -5,17 +5,10 @@
     <link rel="help" href="https://w3c.github.io/mediacapture-record/MediaRecorder.html#mediarecorder">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
+    <script src="utils/sources.js"></script>
 </head>
 <body>
-<canvas id="canvas" width="200" height="200">
-</canvas>
 <script>
-    function createVideoStream() {
-        let canvas = document.getElementById("canvas");
-        canvas.getContext('2d');
-        return canvas.captureStream();
-    }
-
     function recordEvents(target, events) {
         let arr = [];
         for (let ev of events) {
@@ -39,16 +32,16 @@
     }
 
     promise_test(async t => {
-        let video = createVideoStream();
-        let recorder = new MediaRecorder(video);
-        let events = recordEvents(recorder,
+        const {stream: video} = createVideoStream(t);
+        const recorder = new MediaRecorder(video);
+        const events = recordEvents(recorder,
             ["start", "stop", "dataavailable", "pause", "resume", "error"]);
         assert_equals(video.getVideoTracks().length, 1, "video mediastream starts with one track");
         recorder.start();
         assert_equals(recorder.state, "recording", "MediaRecorder has been started successfully");
         video.getVideoTracks()[0].stop();
         assert_equals(recorder.state, "recording", "MediaRecorder state should be recording immediately following last track ending");
-        let event = await new Promise(r => recorder.onstop = r);
+        const event = await new Promise(r => recorder.onstop = r);
 
         assert_equals(event.type, "stop", "the event type should be stop");
         assert_true(event.isTrusted, "isTrusted should be true when the event is created by C++");
@@ -61,16 +54,16 @@
     }, "MediaRecorder will stop recording and fire a stop event when all tracks are ended");
 
     promise_test(async t => {
-        let video = createVideoStream();
-        let recorder = new MediaRecorder(video);
-        let events = recordEvents(recorder,
+        const {stream: video} = createVideoStream(t);
+        const recorder = new MediaRecorder(video);
+        const events = recordEvents(recorder,
             ["start", "stop", "dataavailable", "pause", "resume", "error"]);
         recorder.start();
         assert_equals(recorder.state, "recording", "MediaRecorder has been started successfully");
         recorder.stop();
         assert_equals(recorder.state, "inactive", "MediaRecorder state should be inactive immediately following stop() call");
 
-        let event = await new Promise (r => recorder.onstop = r);
+        const event = await new Promise (r => recorder.onstop = r);
         assert_equals(event.type, "stop", "the event type should be stop");
         assert_true(event.isTrusted, "isTrusted should be true when the event is created by C++");
         assert_equals(recorder.state, "inactive", "MediaRecorder is inactive after stop event");
@@ -82,7 +75,7 @@
     }, "MediaRecorder will stop recording and fire a stop event when stop() is called");
 
     promise_test(async t => {
-        const recorder = new MediaRecorder(createVideoStream());
+        const recorder = new MediaRecorder(createVideoStream(t).stream);
         recorder.stop();
         await Promise.race([
             new Promise((_, reject) => recorder.onstop =
@@ -91,10 +84,10 @@
     }, "MediaRecorder will not fire an exception when stopped after creation");
 
     promise_test(async t => {
-        const recorder = new MediaRecorder(createVideoStream());
+        const recorder = new MediaRecorder(createVideoStream(t).stream);
         recorder.start();
         recorder.stop();
-        let event = await new Promise(r => recorder.onstop = r);
+        const event = await new Promise(r => recorder.onstop = r);
         recorder.stop();
         await Promise.race([
             new Promise((_, reject) => recorder.onstop =
@@ -103,11 +96,11 @@
     }, "MediaRecorder will not fire an exception when stopped after having just been stopped");
 
     promise_test(async t => {
-        const stream = createVideoStream();
+        const {stream} = createVideoStream(t);
         const recorder = new MediaRecorder(stream);
         recorder.start();
         stream.getVideoTracks()[0].stop();
-        let event = await new Promise(r => recorder.onstop = r);
+        const event = await new Promise(r => recorder.onstop = r);
         recorder.stop();
         await Promise.race([
             new Promise((_, reject) => recorder.onstop =
@@ -116,9 +109,9 @@
     }, "MediaRecorder will not fire an exception when stopped after having just been spontaneously stopped");
 
     promise_test(async t => {
-        const stream = await navigator.mediaDevices.getUserMedia({ audio: true, video: true });
+        const {stream} = createAudioVideoStream(t);
         const recorder = new MediaRecorder(stream);
-        let events = [];
+        const events = [];
         const startPromise = new Promise(resolve => recorder.onstart = resolve);
         const stopPromise = new Promise(resolve => recorder.onstop = resolve);
 
@@ -133,9 +126,9 @@
     }, "MediaRecorder will fire start event even if stopped synchronously");
 
     promise_test(async t => {
-        const stream = await navigator.mediaDevices.getUserMedia({ audio: true, video: true });
+        const {stream} = createAudioVideoStream(t);
         const recorder = new MediaRecorder(stream);
-        let events = [];
+        const events = [];
         const startPromise = new Promise(resolve => recorder.onstart = resolve);
         const stopPromise = new Promise(resolve => recorder.onstop = resolve);
         const errorPromise = new Promise(resolve => recorder.onerror = resolve);
diff --git a/tests/wpt/web-platform-tests/mediacapture-record/support/MediaRecorder-iframe.html b/tests/wpt/web-platform-tests/mediacapture-record/support/MediaRecorder-iframe.html
index 6e70acf4862..df60c4e8e18 100644
--- a/tests/wpt/web-platform-tests/mediacapture-record/support/MediaRecorder-iframe.html
+++ b/tests/wpt/web-platform-tests/mediacapture-record/support/MediaRecorder-iframe.html
@@ -2,27 +2,19 @@
 <title>Start a MediaRecorder</title>
 <html>
 <body>
-<canvas id="canvas" width="200px" height="200px"></canvas>
+<script src="../utils/sources.js"></script>
 <script>
     var context;
     var recorder;
     var video;
+    var control;
 
-    function createVideoStream() {
-        const canvas = document.getElementById("canvas");
-        context = canvas.getContext('2d');
-        return canvas.captureStream();
-    }
-
-    function drawSomethingOnCanvas() {
-        context.fillStyle = "red";
-        context.fillRect(0, 0, 10, 10);
-    }
-
-    function prepareForTest() {
-        video = createVideoStream();
+    function prepareForTest(test) {
+        const obj = createVideoStream(test);
+        video = obj.stream;
+        control = obj.control;
         recorder = new MediaRecorder(video);
     }
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/mediacapture-record/utils/sources.js b/tests/wpt/web-platform-tests/mediacapture-record/utils/sources.js
new file mode 100644
index 00000000000..44947272d63
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mediacapture-record/utils/sources.js
@@ -0,0 +1,75 @@
+function createAudioStream(t) {
+  const ac = new AudioContext();
+  const { stream } = ac.createMediaStreamDestination();
+  const [track] = stream.getTracks();
+  t.add_cleanup(() => {
+    ac.close();
+    track.stop();
+  });
+  return { stream };
+}
+
+function createFlowingAudioStream(t) {
+  const ac = new AudioContext();
+  const dest = ac.createMediaStreamDestination();
+  const osc = ac.createOscillator();
+  osc.connect(dest);
+  osc.start();
+  const [track] = dest.stream.getTracks();
+  t.add_cleanup(() => {
+    ac.close();
+    track.stop();
+  });
+  return { stream: dest.stream };
+}
+
+function createVideoStream(t) {
+  const canvas = document.createElement("canvas");
+  canvas.id = "canvas";
+  document.body.appendChild(canvas);
+  const ctx = canvas.getContext("2d");
+  const stream = canvas.captureStream();
+  const [track] = stream.getTracks();
+  t.add_cleanup(() => {
+    document.body.removeChild(canvas);
+    track.stop();
+  });
+  const addVideoFrame = () => {
+    ctx.fillStyle = "red";
+    ctx.fillRect(0, 0, canvas.width, canvas.height);
+  };
+  return { stream, control: { addVideoFrame } };
+}
+
+function createFlowingVideoStream(t) {
+  const { stream } = createVideoStream(t);
+  const [track] = stream.getTracks();
+  const canvas = document.getElementById("canvas");
+  const ctx = canvas.getContext("2d");
+  ctx.fillStyle = "green";
+  requestAnimationFrame(function draw() {
+    ctx.fillRect(0, 0, canvas.width, canvas.height);
+    if (track.readyState == "live") {
+      requestAnimationFrame(draw);
+    }
+  });
+  return { stream };
+}
+
+function createAudioVideoStream(t) {
+  const { stream: audio } = createAudioStream(t);
+  const { stream: video, control } = createVideoStream(t);
+  return {
+    stream: new MediaStream([...audio.getTracks(), ...video.getTracks()]),
+    control,
+  };
+}
+
+function createFlowingAudioVideoStream(t) {
+  return {
+    stream: new MediaStream([
+      ...createFlowingAudioStream(t).stream.getTracks(),
+      ...createFlowingVideoStream(t).stream.getTracks(),
+    ]),
+  };
+}
diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/common.js b/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/common.js
index de25ce71089..308f787da63 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/common.js
+++ b/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/common.js
@@ -71,7 +71,7 @@ setup(() => {
     if (window.reporting_observer_callback) {
       reports.forEach(window.reporting_observer_callback);
     }
-  }, {types: ["feature-policy-violation"]});
+  }, {types: ["permissions-policy-violation"]});
   window.reporting_observer_instance.observe();
   window.reporting_observer_callback = null;
 });
diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/permissions-policy-trust-token-redemption.html b/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/permissions-policy-trust-token-redemption.html
index 329f0faa0d3..7ad0ace57d4 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/permissions-policy-trust-token-redemption.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/experimental-features/resources/permissions-policy-trust-token-redemption.html
@@ -3,14 +3,14 @@
 
   window.onload = function() {
     // When the trust-token-redemption permissions policy is enabled, redemption
-    // and signing ("send-srr") should both be available; when it's disabled,
+    // and signing ("send-redemption-record") should both be available; when it's disabled,
     // they should both be unavailable. Send the number of available operations
     // upstream in order to enforce this in assertions.
     let num_enabled = 4;
     try {
       new Request("https://issuer.example/", {
         trustToken: {
-          type: "srr-token-redemption"
+          type: "token-redemption"
         }
       });
     } catch (e) {
@@ -19,7 +19,7 @@
     try {
       new Request("https://destination.example/", {
         trustToken: {
-          type: "send-srr",
+          type: "send-redemption-record",
           issuers: ["https://issuer.example/"]
         }
       });
@@ -31,7 +31,7 @@
       const xhr = new XMLHttpRequest();
       xhr.open("GET", "https://issuer.example/");
       xhr.setTrustToken({
-        type: "srr-token-redemption"
+        type: "token-redemption"
       });
     } catch (e) {
       num_enabled--;
@@ -41,7 +41,7 @@
       const xhr = new XMLHttpRequest();
       xhr.open("GET", "https://destination.example/");
       xhr.setTrustToken({
-        type: "send-srr",
+        type: "send-redemption-record",
         issuers: ["https://issuer.example/"]
       });
     } catch (e) {
diff --git a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/trust-token-redemption-default-permissions-policy.tentative.https.sub.html b/tests/wpt/web-platform-tests/permissions-policy/experimental-features/trust-token-redemption-default-permissions-policy.tentative.https.sub.html
index 8adc0c398ed..20736879105 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/experimental-features/trust-token-redemption-default-permissions-policy.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/experimental-features/trust-token-redemption-default-permissions-policy.tentative.https.sub.html
@@ -18,12 +18,12 @@
         // and XHR interfaces.
         new Request("https://issuer.example/", {
           trustToken: {
-            type: "srr-token-redemption"
+            type: "token-redemption"
           }
         });
         new Request("https://destination.example/", {
           trustToken: {
-            type: "send-srr", // signing
+            type: "send-redemption-record", // signing
             issuers: ["https://issuer.example/"]
           }
         });
@@ -31,13 +31,13 @@
         const redemption_xhr = new XMLHttpRequest();
         redemption_xhr.open("GET", "https://issuer.example/");
         redemption_xhr.setTrustToken({
-          type: "srr-token-redemption"
+          type: "token-redemption"
         });
 
         const signing_xhr = new XMLHttpRequest();
         signing_xhr.open("GET", "https://destination.example/");
         signing_xhr.setTrustToken({
-          type: "send-srr", // signing
+          type: "send-redemption-record", // signing
           issuers: ["https://issuer.example/"]
         });
       } catch (e) {
diff --git a/tests/wpt/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy.https.sub.html b/tests/wpt/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy.https.sub.html
index cb619bc225a..456626c350f 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy.https.sub.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/payment-allowed-by-permissions-policy.https.sub.html
@@ -29,19 +29,12 @@
 
   async_test(t => {
     test_feature_availability('PaymentRequest()', t, cross_origin_src,
-        expect_feature_available_default);
-  }, header + ' allows cross-origin iframes.');
+        expect_feature_unavailable_default);
+  }, header + ' disallows cross-origin iframes.');
 
   async_test(t => {
-    test_feature_availability(
-        'PaymentRequest()', t, same_origin_src,
-        expect_feature_available_default, undefined, 'allowpaymentrequest');
-  }, header + ' allowpaymentrequest=true allows same-origin iframes.');
-
-  async_test(t => {
-    test_feature_availability(
-        'PaymentRequest()', t, cross_origin_src,
-        expect_feature_available_default, undefined, 'allowpaymentrequest');
-  }, header + ' allowpaymentrequest=true allows cross-origin iframes.');
+    test_feature_availability('PaymentRequest()', t, cross_origin_src,
+        expect_feature_available_default, 'payment');
+  }, header + ' allow="payment" allows cross-origin iframes.');
   </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-all.https.sub.html b/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-all.https.sub.html
index d91132599fc..a089866c7af 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-all.https.sub.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-all.https.sub.html
@@ -19,12 +19,15 @@
       ['*']);
   }, header_policy + ' -- test allowlist is ['*']');
 
-  // Test that fullscreen is allowed on all subframes.
+  // Test that fullscreen is allowed on same-origin subframes.
   test_allowed_feature_for_subframe(
     header_policy + ' -- test fullscreen is allowed on same-origin subframe',
     'fullscreen',
     same_origin_src);
-  test_allowed_feature_for_subframe(
+
+  // Test that fullscreen is not allowed on cross-origin subframes without an
+  // allow attribute.
+  test_disallowed_feature_for_subframe(
     header_policy + ' -- test fullscreen is allowed on cross-origin subframe',
     'fullscreen',
     cross_origin_src);
diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-some.https.sub.html b/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-some.https.sub.html
index 1e999a5e5e5..0035eea7d5e 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-some.https.sub.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-allowed-for-some.https.sub.html
@@ -19,12 +19,13 @@
       [same_origin, cross_origin, 'https://www.example.com'].sort());
   }, header_policy + ' -- test allowlist is [same_origin, cross_origin, https://www.example.com]');
 
-  // Test that fullscreen is allowed on same_origin, some cross_origin subframes.
+  // Test that fullscreen is allowed on same-origin, but disallowd on cross-
+  // origin subframes. without an allow attribute.
   test_allowed_feature_for_subframe(
     header_policy + ' -- test fullscreen is allowed on same-origin subframe',
     'fullscreen',
     same_origin_src);
-  test_allowed_feature_for_subframe(
+  test_disallowed_feature_for_subframe(
     header_policy + ' -- test fullscreen is allowed on cross-origin ' + cross_origin_src + ' subframe',
     'fullscreen',
     cross_origin_src);
diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-declined.https.sub.html b/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-declined.https.sub.html
index 8455d68c071..247f23893ba 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-declined.https.sub.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-header-policy-declined.https.sub.html
@@ -19,12 +19,12 @@
       [cross_origin, 'https://www.example.com'].sort());
   }, header_policy + ' -- test allowlist is [cross_origin, https://www.example.com]');
 
-  // Test that fullscreen is disallowed on same_origin, allowed on some cross_origin subframes.
+  // Test that fullscreen is everywhere.
   test_disallowed_feature_for_subframe(
     header_policy + ' -- test fullscreen is allowed on same-origin subframe',
     'fullscreen',
     same_origin_src);
-  test_allowed_feature_for_subframe(
+  test_disallowed_feature_for_subframe(
     header_policy + ' -- test fullscreen is allowed on cross-origin ' + cross_origin_src + ' subframe',
     'fullscreen',
     cross_origin_src);
@@ -34,7 +34,8 @@
     'fullscreen',
     cross_origin_src1);
 
-  // dynamically update sub frame's container policy
+  // dynamically update sub frame's container policy; fullscreen will still not
+  // be allowed.
   var disallow = "fullscreen 'none';"
   test_disallowed_feature_for_subframe(
     header_policy + ', iframe.allow = ' + disallow + ' -- test fullscreen is disallowed on same-origin subframe',
@@ -55,7 +56,7 @@
     same_origin_src,
     allow);
 
-  test_allowed_feature_for_subframe(
+  test_disallowed_feature_for_subframe(
     header_policy + 'iframe.allow = ' + allow + ' -- test fullscreen is allowed on specific cross-origin subframe',
     'fullscreen',
     cross_origin_src,
diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-all.https.sub.html b/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-all.https.sub.html
index 74ff64c51d2..46ca378d0b9 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-all.https.sub.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-all.https.sub.html
@@ -29,7 +29,7 @@
      ------------------------------------------ */
   test_subframe_header_policy('fullscreen', '*', same_origin_src,
       {local_all: true, local_self: true, local_none: false,
-      remote_all: true, remote_self: true, remote_none: false},
+      remote_all: false, remote_self: false, remote_none: false},
       'Test nested header policy with local iframe on policy "fullscreen=*"');
   test_subframe_header_policy('fullscreen', 'self', same_origin_src,
       {local_all: true, local_self: true, local_none: false,
@@ -50,11 +50,11 @@
      |  -------------------------------------  |
      ------------------------------------------- */
   test_subframe_header_policy('fullscreen', '*', cross_origin_src,
-      {local_all: true, local_self: true, local_none: false,
-      remote_all: true, remote_self: true, remote_none: false},
+      {local_all: false, local_self: false, local_none: false,
+      remote_all: false, remote_self: false, remote_none: false},
       'Test nested header policy with remote iframe on policy "fullscreen=*"');
   test_subframe_header_policy('fullscreen', 'self', cross_origin_src,
-      {local_all: true, local_self: true, local_none: false,
+      {local_all: false, local_self: false, local_none: false,
       remote_all: false, remote_self: false, remote_none: false},
       'Test nested header policy with remote iframe on policy "fullscreen=self"');
   test_subframe_header_policy('fullscreen', '\\(\\)', cross_origin_src,
diff --git a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-self.https.sub.html b/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-self.https.sub.html
index f1e5f9d2e24..54c6e95b6ed 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-self.https.sub.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/permissions-policy-nested-header-policy-allowed-for-self.https.sub.html
@@ -27,7 +27,7 @@
      ------------------------------------------ */
   test_subframe_header_policy('fullscreen', '*', same_origin_src,
       {local_all: true, local_self: true, local_none: false,
-      remote_all: true, remote_self: true, remote_none: false},
+      remote_all: false, remote_self: false, remote_none: false},
       'Test nested header policy with local iframe on policy "fullscreen=*"');
   test_subframe_header_policy('fullscreen', 'self', same_origin_src,
       {local_all: true, local_self: true, local_none: false,
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/camera-report-only.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/camera-report-only.https.html
index c22e1a51740..5c6658bab86 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/camera-report-only.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/camera-report-only.https.html
@@ -10,7 +10,7 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.body.featureId, "camera");
   assert_equals(report.body.disposition, "report");
 };
@@ -18,7 +18,7 @@ var check_report_format = ([reports, observer]) => {
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
   await test_driver.bless('Activate document for user media');
   await navigator.mediaDevices.getUserMedia({video: true});
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/camera-reporting.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/camera-reporting.https.html
index 12b48dccb73..ec7965faf54 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/camera-reporting.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/camera-reporting.https.html
@@ -10,7 +10,7 @@ var t = async_test("Camera Report Format");
 
 var check_report_format = (reports, observer) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "camera");
   assert_equals(report.body.sourceFile, document.location.href);
@@ -20,7 +20,7 @@ var check_report_format = (reports, observer) => {
 };
 
 new ReportingObserver(t.step_func_done(check_report_format),
-                      {types: ['feature-policy-violation']}).observe();
+                      {types: ['permissions-policy-violation']}).observe();
 
 navigator.mediaDevices.getUserMedia({video: true}).then(
   t.unreached_func("UserMedia camera access should not be allowed in this document.")
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/encrypted-media-report-only.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/encrypted-media-report-only.https.html
index 9ab4b0fe856..72a1ca23682 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/encrypted-media-report-only.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/encrypted-media-report-only.https.html
@@ -8,7 +8,7 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.body.featureId, "encrypted-media");
   assert_equals(report.body.disposition, "report");
 };
@@ -16,7 +16,7 @@ var check_report_format = ([reports, observer]) => {
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
   await navigator.requestMediaKeySystemAccess("org.w3.clearkey",
       [{
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/encrypted-media-reporting.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/encrypted-media-reporting.https.html
index 1f891a57801..32a5a2cc487 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/encrypted-media-reporting.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/encrypted-media-reporting.https.html
@@ -8,7 +8,7 @@
     <script>
 var check_report_format = (reports, observer) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "encrypted-media");
   assert_equals(report.body.disposition, "enforce");
@@ -20,7 +20,7 @@ var check_report_format = (reports, observer) => {
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
   await promise_rejects_dom(t, "SecurityError",
     navigator.requestMediaKeySystemAccess("org.w3.clearkey",
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/fullscreen-report-only.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/fullscreen-report-only.html
index 48fe9e3a69a..caf31f6b790 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/fullscreen-report-only.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/fullscreen-report-only.html
@@ -11,7 +11,7 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.body.featureId, "fullscreen");
   assert_equals(report.body.disposition, "report");
 };
@@ -19,7 +19,7 @@ var check_report_format = ([reports, observer]) => {
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
   await test_driver.bless('Activate document for fullscreen');
   await document.getElementById('fs').requestFullscreen();
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/fullscreen-reporting.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/fullscreen-reporting.html
index 3ac1ef40cce..d7b905744d6 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/fullscreen-reporting.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/fullscreen-reporting.html
@@ -15,7 +15,7 @@ var check_report_format = (reports, observer) => {
   observer1.disconnect();
   observer2.disconnect();
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "fullscreen");
   assert_equals(report.body.sourceFile, document.location.href);
@@ -26,16 +26,16 @@ var check_report_format = (reports, observer) => {
 
 var check_second_observer = (reports, observer) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.body.featureId, "fullscreen");
 };
 
 async_test(t => {
   observer1 = new ReportingObserver(t.step_func(check_report_format),
-                                    {types: ['feature-policy-violation']});
+                                    {types: ['permissions-policy-violation']});
   observer1.observe();
   observer2 = new ReportingObserver(t.step_func_done(check_second_observer),
-                                    {types: ['feature-policy-violation']});
+                                    {types: ['permissions-policy-violation']});
   observer2.observe();
   document.getElementById('fs').requestFullscreen().then(t.unreached_func(
     "Fullscreen should not be allowed in this document.")).catch(()=>{});
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/generic-sensor-report-only.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/generic-sensor-report-only.https.html
index 6c8c2efbf6c..21fb850391b 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/generic-sensor-report-only.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/generic-sensor-report-only.https.html
@@ -24,7 +24,7 @@ var check_report_format = function(reports, observer) {
     assert_false(sensor_features_verified[report.body.featureId]);
 
     // Validate the remainder of the report
-    assert_equals(report.type, "feature-policy-violation");
+    assert_equals(report.type, "permissions-policy-violation");
     assert_equals(report.url, document.location.href);
     assert_equals(report.body.sourceFile, document.location.href);
     assert_equals(typeof report.body.lineNumber, "number");
@@ -44,7 +44,7 @@ var check_report_format = function(reports, observer) {
 
 async_test(t => {
   new ReportingObserver(t.step_func(check_report_format),
-                        {types: ['feature-policy-violation']}).observe();
+                        {types: ['permissions-policy-violation']}).observe();
   new Accelerometer();
   new AmbientLightSensor();
   new Gyroscope();
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/generic-sensor-reporting.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/generic-sensor-reporting.https.html
index 9a5d404d345..c29c069ee3c 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/generic-sensor-reporting.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/generic-sensor-reporting.https.html
@@ -24,7 +24,7 @@ var check_report_format = function(reports, observer) {
     assert_false(sensor_features_verified[report.body.featureId]);
 
     // Validate the remainder of the report
-    assert_equals(report.type, "feature-policy-violation");
+    assert_equals(report.type, "permissions-policy-violation");
     assert_equals(report.url, document.location.href);
     assert_equals(report.body.sourceFile, document.location.href);
     assert_equals(typeof report.body.lineNumber, "number");
@@ -44,7 +44,7 @@ var check_report_format = function(reports, observer) {
 
 async_test(t => {
   new ReportingObserver(t.step_func(check_report_format),
-                        {types: ['feature-policy-violation']}).observe();
+                        {types: ['permissions-policy-violation']}).observe();
   assert_throws_dom("SecurityError", () => new Accelerometer(), "Constructing sensors should be blocked by policy");
   assert_throws_dom("SecurityError", () => new AmbientLightSensor(), "Constructing sensors should be blocked by policy");
   assert_throws_dom("SecurityError", () => new Gyroscope(), "Constructing sensors should be blocked by policy");
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/geolocation-report-only.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/geolocation-report-only.https.html
index 6c62b622cda..abffd62cfc7 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/geolocation-report-only.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/geolocation-report-only.https.html
@@ -8,7 +8,7 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.body.featureId, "geolocation");
   assert_equals(report.body.disposition, "report");
 };
@@ -16,7 +16,7 @@ var check_report_format = ([reports, observer]) => {
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
   try {
     await new Promise((resolve, reject) => {
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/geolocation-reporting.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/geolocation-reporting.https.html
index fe8761f803b..e0eb275bcc2 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/geolocation-reporting.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/geolocation-reporting.https.html
@@ -10,7 +10,7 @@ var t = async_test("Geolocation Report Format");
 
 var check_report_format = (reports, observer) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "geolocation");
   assert_equals(report.body.sourceFile, document.location.href);
@@ -20,7 +20,7 @@ var check_report_format = (reports, observer) => {
 };
 
 new ReportingObserver(t.step_func_done(check_report_format),
-                      {types: ['feature-policy-violation']}).observe();
+                      {types: ['permissions-policy-violation']}).observe();
 
 navigator.geolocation.getCurrentPosition(
   t.unreached_func("geolocation should be disabled in this document"),
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/microphone-report-only.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/microphone-report-only.https.html
index 539994cd70a..29e9388fc87 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/microphone-report-only.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/microphone-report-only.https.html
@@ -10,7 +10,7 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.body.featureId, "microphone");
   assert_equals(report.body.disposition, "report");
 };
@@ -18,7 +18,7 @@ var check_report_format = ([reports, observer]) => {
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
   await test_driver.bless('Activate document for user media');
   await navigator.mediaDevices.getUserMedia({audio: true});
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/microphone-reporting.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/microphone-reporting.https.html
index 2aeba8194e4..13df0c148de 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/microphone-reporting.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/microphone-reporting.https.html
@@ -10,7 +10,7 @@ var t = async_test("Microphone Report Format");
 
 var check_report_format = (reports, observer) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "microphone");
   assert_equals(report.body.sourceFile, document.location.href);
@@ -20,7 +20,7 @@ var check_report_format = (reports, observer) => {
 };
 
 new ReportingObserver(t.step_func_done(check_report_format),
-                      {types: ['feature-policy-violation']}).observe();
+                      {types: ['permissions-policy-violation']}).observe();
 
 navigator.mediaDevices.getUserMedia({audio: true}).then(
   t.unreached_func("UserMedia microphone access should not be allowed in this document.")
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/midi-report-only.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/midi-report-only.https.html
index bf0234d3f65..3aa12dcfb5c 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/midi-report-only.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/midi-report-only.https.html
@@ -8,7 +8,7 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.body.featureId, "midi");
   assert_equals(report.body.disposition, "report");
 };
@@ -16,7 +16,7 @@ var check_report_format = ([reports, observer]) => {
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
   try {
     await navigator.requestMIDIAccess();
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/midi-reporting.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/midi-reporting.https.html
index 9e8a6ebf8e8..6cc07f53715 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/midi-reporting.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/midi-reporting.https.html
@@ -8,7 +8,7 @@
     <script>
 var check_report_format = (reports, observer) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "midi");
   assert_equals(report.body.sourceFile, document.location.href);
@@ -20,7 +20,7 @@ var check_report_format = (reports, observer) => {
 promise_test(async (t) => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
   await promise_rejects_dom(t, 'SecurityError', navigator.requestMIDIAccess(),
                         "MIDI device access should not be allowed in this document.");
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/payment-report-only.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/payment-report-only.https.html
index d2b8e5ee9cc..f5105c3b000 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/payment-report-only.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/payment-report-only.https.html
@@ -8,7 +8,7 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.body.featureId, "payment");
   assert_equals(report.body.disposition, "report");
 };
@@ -16,7 +16,7 @@ var check_report_format = ([reports, observer]) => {
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
   try {
     const request = new PaymentRequest(
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/payment-reporting.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/payment-reporting.https.html
index 50972baacb9..72529bf9f19 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/payment-reporting.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/payment-reporting.https.html
@@ -11,7 +11,7 @@ var t = async_test("PaymentRequest Report Format");
 
 var check_report_format = (reports, observer) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "payment");
   assert_equals(report.body.sourceFile, document.location.href);
@@ -22,7 +22,7 @@ var check_report_format = (reports, observer) => {
 };
 
 new ReportingObserver(t.step_func_done(check_report_format),
-                      {types: ['feature-policy-violation']}).observe();
+                      {types: ['permissions-policy-violation']}).observe();
 
 t.step_func(() => {
   assert_throws_dom('SecurityError',
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/picture-in-picture-report-only.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/picture-in-picture-report-only.html
index 9e113a92429..0caa2ae953b 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/picture-in-picture-report-only.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/picture-in-picture-report-only.html
@@ -12,7 +12,7 @@
     <script>
 const check_report_format = ([reports, observer]) => {
   const report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.body.featureId, "picture-in-picture");
   assert_equals(report.body.disposition, "report");
 };
@@ -28,7 +28,7 @@ const loadVideo = () => new Promise(resolve => {
 promise_pip_test(async (t) => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
   const videoElement = await loadVideo();
   await test_driver.bless('picture-in-picture');
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/picture-in-picture-reporting.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/picture-in-picture-reporting.html
index d1c641d81d7..177e4d5c02a 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/picture-in-picture-reporting.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/picture-in-picture-reporting.html
@@ -12,7 +12,7 @@
     <script>
 const check_report_format = (reports, observer) => {
   const report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "picture-in-picture");
   assert_equals(report.body.sourceFile, document.location.href);
@@ -32,7 +32,7 @@ const loadVideo = () => new Promise(resolve => {
 promise_pip_test(async (t) => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
   const videoElement = await loadVideo();
   await test_driver.bless('picture-in-picture');
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/serial-report-only.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/serial-report-only.https.html
index 11913a2ef77..3a410362ded 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/serial-report-only.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/serial-report-only.https.html
@@ -11,7 +11,7 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.body.featureId, "serial");
   assert_equals(report.body.disposition, "report");
 };
@@ -19,7 +19,7 @@ var check_report_format = ([reports, observer]) => {
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
 
   await test_driver.bless('Activate document for serial.requestPort');
@@ -35,7 +35,7 @@ promise_test(async t => {
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
 
   await navigator.serial.getPorts();
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/serial-reporting.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/serial-reporting.https.html
index 827bc89367c..c96d8f878a9 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/serial-reporting.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/serial-reporting.https.html
@@ -10,7 +10,7 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "serial");
   assert_equals(report.body.sourceFile, document.location.href);
@@ -22,7 +22,7 @@ var check_report_format = ([reports, observer]) => {
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
 
   await test_driver.bless('Activate document for serial.requestPort');
@@ -38,7 +38,7 @@ promise_test(async t => {
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
 
   try {
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/sync-xhr-report-only.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/sync-xhr-report-only.html
index 76d26ed5027..29b1368a2e9 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/sync-xhr-report-only.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/sync-xhr-report-only.html
@@ -8,7 +8,7 @@
     <script>
 const check_report_format = ([reports, observer]) => {
   const report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.body.featureId, "sync-xhr");
   assert_equals(report.body.disposition, "report");
 };
@@ -16,7 +16,7 @@ const check_report_format = ([reports, observer]) => {
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
   const xhr = new XMLHttpRequest();
   xhr.open("GET", document.location.href, false);
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/sync-xhr-reporting.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/sync-xhr-reporting.html
index 5427bfd6859..a8fdb09ecee 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/sync-xhr-reporting.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/sync-xhr-reporting.html
@@ -11,7 +11,7 @@ var t = async_test("Sync-xhr Report Format");
 
 var check_report_format = (reports, observer) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "sync-xhr");
   assert_equals(report.body.sourceFile, document.location.href);
@@ -22,7 +22,7 @@ var check_report_format = (reports, observer) => {
 };
 
 new ReportingObserver(t.step_func_done(check_report_format),
-                      {types: ['feature-policy-violation']}).observe();
+                      {types: ['permissions-policy-violation']}).observe();
 
 t.step_func(() => {
   var xhr = new XMLHttpRequest();
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/usb-report-only.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/usb-report-only.https.html
index 7933e9eb5f6..5a965311158 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/usb-report-only.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/usb-report-only.https.html
@@ -11,7 +11,7 @@
     <script>
 var check_report_format = ([reports, observer]) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.body.featureId, "usb");
   assert_equals(report.body.disposition, "report");
 };
@@ -19,7 +19,7 @@ var check_report_format = ([reports, observer]) => {
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
   await test_driver.bless('Activate document for USB');
   await navigator.usb.getDevices();
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/usb-reporting.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/usb-reporting.https.html
index a63f3010e4e..1ec5ba43709 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/usb-reporting.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/usb-reporting.https.html
@@ -10,7 +10,7 @@ var t = async_test("USB Report Format");
 
 var check_report_format = (reports, observer) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "usb");
   assert_equals(report.body.sourceFile, document.location.href);
@@ -20,7 +20,7 @@ var check_report_format = (reports, observer) => {
 };
 
 new ReportingObserver(t.step_func_done(check_report_format),
-                      {types: ['feature-policy-violation']}).observe();
+                      {types: ['permissions-policy-violation']}).observe();
 
 navigator.usb.getDevices().then(
   t.unreached_func("USB device access should not be allowed in this document.")
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/xr-report-only.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/xr-report-only.https.html
index ead03d6a9f6..f39ecf34326 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/xr-report-only.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/xr-report-only.https.html
@@ -8,7 +8,7 @@
     <script>
 const check_report_format = ([reports, observer]) => {
   const report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "xr-spatial-tracking");
   assert_equals(report.body.sourceFile, document.location.href);
@@ -20,7 +20,7 @@ const check_report_format = ([reports, observer]) => {
 promise_test(async t => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
   try {
     let supported = await navigator.xr.isSessionSupported('immersive-vr');
diff --git a/tests/wpt/web-platform-tests/permissions-policy/reporting/xr-reporting.https.html b/tests/wpt/web-platform-tests/permissions-policy/reporting/xr-reporting.https.html
index 3d629235d73..d87d4fb028d 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/reporting/xr-reporting.https.html
+++ b/tests/wpt/web-platform-tests/permissions-policy/reporting/xr-reporting.https.html
@@ -8,7 +8,7 @@
     <script>
 var check_report_format = (reports, observer) => {
   let report = reports[0];
-  assert_equals(report.type, "feature-policy-violation");
+  assert_equals(report.type, "permissions-policy-violation");
   assert_equals(report.url, document.location.href);
   assert_equals(report.body.featureId, "xr-spatial-tracking");
   assert_equals(report.body.sourceFile, document.location.href);
@@ -20,7 +20,7 @@ var check_report_format = (reports, observer) => {
 promise_test(async (t) => {
   const report = new Promise(resolve => {
     new ReportingObserver((reports, observer) => resolve([reports, observer]),
-                          {types: ['feature-policy-violation']}).observe();
+                          {types: ['permissions-policy-violation']}).observe();
   });
   await promise_rejects_dom(t, 'SecurityError',
                         navigator.xr.isSessionSupported('immersive-vr'),
diff --git a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy.js b/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy.js
index 1c5bf97b50c..ea6d47a089a 100644
--- a/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy.js
+++ b/tests/wpt/web-platform-tests/permissions-policy/resources/permissions-policy.js
@@ -433,6 +433,6 @@ function expect_reports(report_count, policy_name, description) {
         if (num_received_reports >= report_count) {
             t.done();
         }
-   }), {types: ['feature-policy-violation'], buffered: true}).observe();
+   }), {types: ['permissions-policy-violation'], buffered: true}).observe();
   }, description);
 }
diff --git a/tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js b/tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js
index ff11ca1ab0b..85891c6ef12 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js
@@ -45,6 +45,11 @@ var GenericSensorTest = (() => {
       this.sensorReadingTimerId_ = null;
       this.readingData_ = null;
       this.requestedFrequencies_ = [];
+      // The Blink implementation (third_party/blink/renderer/modules/sensor/sensor.cc)
+      // sets a timestamp by creating a DOMHighResTimeStamp from a given platform timestamp.
+      // In this mock implementation we use a starting value
+      // and an increment step value that resemble a platform timestamp reasonably enough.
+      this.timestamp_ = window.performance.timeOrigin;
       let rv = handle.mapBuffer(offset, size);
       if (rv.result != Mojo.RESULT_OK) {
         throw new Error("MockSensor(): Failed to map shared buffer");
@@ -132,7 +137,7 @@ var GenericSensorTest = (() => {
 
       const reading = this.readingData_.value();
       this.buffer_.set(reading, 2);
-      this.buffer_[1] = window.performance.now() * 0.001;
+      this.buffer_[1] = this.timestamp_++;
     }
 
     // Sets flag that forces sensor to fail when addConfiguration is invoked.
@@ -158,8 +163,9 @@ var GenericSensorTest = (() => {
           this.buffer_.set(reading, 2);
         }
         // For all tests sensor reading should have monotonically
-        // increasing timestamp in seconds.
-        this.buffer_[1] = window.performance.now() * 0.001;
+        // increasing timestamp.
+        this.buffer_[1] = this.timestamp_++;
+
         if (this.reportingMode_ === device.mojom.ReportingMode.ON_CHANGE &&
             this.notifyOnReadingChange_) {
           this.client_.sensorReadingChanged();
diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/helpers.js b/tests/wpt/web-platform-tests/resources/test/tests/unit/helpers.js
index b273a72589f..ca378a27c91 100644
--- a/tests/wpt/web-platform-tests/resources/test/tests/unit/helpers.js
+++ b/tests/wpt/web-platform-tests/resources/test/tests/unit/helpers.js
@@ -11,7 +11,7 @@ function test_failure(fn, name) {
       if (err instanceof AssertionError) {
         return;
       }
-      throw new AssertionError('Expected an AssertionError, but');
+      throw new AssertionError('Expected an AssertionError, but' + err);
     }
     throw new AssertionError(
       'Expected an AssertionError, but no error was thrown'
diff --git a/tests/wpt/web-platform-tests/resources/test/tests/unit/unpaired-surrogates.html b/tests/wpt/web-platform-tests/resources/test/tests/unit/unpaired-surrogates.html
index 1b162fe71d2..b2321113265 100644
--- a/tests/wpt/web-platform-tests/resources/test/tests/unit/unpaired-surrogates.html
+++ b/tests/wpt/web-platform-tests/resources/test/tests/unit/unpaired-surrogates.html
@@ -114,6 +114,7 @@ promise_test(() => {
         test(() => {}, 'U+d800U+d801 must be sanitized: \ud800\ud801');
         test(() => {}, 'U+dfff must be sanitized: \udfff');
         test(() => {}, 'U+dc00U+d800U+dc00U+d800 must be sanitized: \udc00\ud800\udc00\ud800');
+        test(() => {}, 'U+dbffU+dfffU+dfff must be sanitized: \udbff\udfff\udfff');
         test(() => {}, 'after');
       }
     ).then(({harness, tests}) => {
@@ -130,6 +131,10 @@ promise_test(() => {
         tests['U+dc00U+d800U+dc00U+d800 must be sanitized: U+dc00\ud800\udc00U+d800'],
         'PASS'
       );
+      assert_equals(
+        tests['U+dbffU+dfffU+dfff must be sanitized: \udbff\udfffU+dfff'],
+        'PASS'
+      );
       assert_equals(tests.after, 'PASS');
     });
 }, 'sub-test names which include unpaired surrogates');
diff --git a/tests/wpt/web-platform-tests/resources/testdriver-actions.js b/tests/wpt/web-platform-tests/resources/testdriver-actions.js
index f3e6388e8ac..4dafa0c018b 100644
--- a/tests/wpt/web-platform-tests/resources/testdriver-actions.js
+++ b/tests/wpt/web-platform-tests/resources/testdriver-actions.js
@@ -281,9 +281,12 @@
      *                               pointer source
      * @returns {Actions}
      */
-    pointerDown: function({button=this.ButtonType.LEFT, sourceName=null}={}) {
+    pointerDown: function({button=this.ButtonType.LEFT, sourceName=null,
+                           width, height, pressure, tangentialPressure,
+                           tiltX, tiltY, twist, altitudeAngle, azimuthAngle}={}) {
       let source = this.getSource("pointer", sourceName);
-      source.pointerDown(this, button);
+      source.pointerDown(this, button, width, height, pressure, tangentialPressure,
+                         tiltX, tiltY, twist, altitudeAngle, azimuthAngle);
       return this;
     },
 
@@ -314,9 +317,13 @@
      * @returns {Actions}
      */
     pointerMove: function(x, y,
-                          {origin="viewport", duration, sourceName=null}={}) {
+                          {origin="viewport", duration, sourceName=null,
+                           width, height, pressure, tangentialPressure,
+                           tiltX, tiltY, twist, altitudeAngle, azimuthAngle}={}) {
       let source = this.getSource("pointer", sourceName);
-      source.pointerMove(this, x, y, duration, origin);
+      source.pointerMove(this, x, y, duration, origin, width, height, pressure,
+                         tangentialPressure, tiltX, tiltY, twist, altitudeAngle,
+                         azimuthAngle);
       return this;
     },
 
@@ -424,6 +431,38 @@
     this.actions = new Map();
   }
 
+  function setPointerProperties(action, width, height, pressure, tangentialPressure,
+                                tiltX, tiltY, twist, altitudeAngle, azimuthAngle) {
+    if (width) {
+      action.width = width;
+    }
+    if (height) {
+      action.height = height;
+    }
+    if (pressure) {
+      action.pressure = pressure;
+    }
+    if (tangentialPressure) {
+      action.tangentialPressure = tangentialPressure;
+    }
+    if (tiltX) {
+      action.tiltX = tiltX;
+    }
+    if (tiltY) {
+      action.tiltY = tiltY;
+    }
+    if (twist) {
+      action.twist = twist;
+    }
+    if (altitudeAngle) {
+      action.altitudeAngle = altitudeAngle;
+    }
+    if (azimuthAngle) {
+      action.azimuthAngle = azimuthAngle;
+    }
+    return action;
+  }
+
   PointerSource.prototype = {
     serialize: function(tickCount) {
       if (!this.actions.size) {
@@ -441,12 +480,16 @@
       return data;
     },
 
-    pointerDown: function(actions, button) {
+    pointerDown: function(actions, button, width, height, pressure, tangentialPressure,
+                          tiltX, tiltY, twist, altitudeAngle, azimuthAngle) {
       let tick = actions.tickIdx;
       if (this.actions.has(tick)) {
         tick = actions.addTick().tickIdx;
       }
-      this.actions.set(tick, {type: "pointerDown", button});
+      let actionProperties = setPointerProperties({type: "pointerDown", button}, width, height,
+                                                  pressure, tangentialPressure, tiltX, tiltY,
+                                                  twist, altitudeAngle, azimuthAngle);
+      this.actions.set(tick, actionProperties);
     },
 
     pointerUp: function(actions, button) {
@@ -457,15 +500,20 @@
       this.actions.set(tick, {type: "pointerUp", button});
     },
 
-    pointerMove: function(actions, x, y, duration, origin) {
+    pointerMove: function(actions, x, y, duration, origin, width, height, pressure,
+                          tangentialPressure, tiltX, tiltY, twist, altitudeAngle, azimuthAngle) {
       let tick = actions.tickIdx;
       if (this.actions.has(tick)) {
         tick = actions.addTick().tickIdx;
       }
-      this.actions.set(tick, {type: "pointerMove", x, y, origin});
+      let moveAction = {type: "pointerMove", x, y, origin};
       if (duration) {
-        this.actions.get(tick).duration = duration;
+        moveAction.duration = duration;
       }
+      let actionProperties = setPointerProperties(moveAction, width, height, pressure,
+                                                  tangentialPressure, tiltX, tiltY, twist,
+                                                  altitudeAngle, azimuthAngle);
+      this.actions.set(tick, actionProperties);
     },
 
     addPause: function(actions, duration) {
diff --git a/tests/wpt/web-platform-tests/resources/testharness.js b/tests/wpt/web-platform-tests/resources/testharness.js
index d50e094117d..f7fe7531710 100644
--- a/tests/wpt/web-platform-tests/resources/testharness.js
+++ b/tests/wpt/web-platform-tests/resources/testharness.js
@@ -2956,22 +2956,16 @@ policies and contribution forms [3].
     }
 
     function sanitize_unpaired_surrogates(str) {
-        return str.replace(/([\ud800-\udbff])(?![\udc00-\udfff])/g,
-                           function(_, unpaired)
-                           {
-                               return code_unit_str(unpaired);
-                           })
-                  // This replacement is intentionally implemented without an
-                  // ES2018 negative lookbehind assertion to support runtimes
-                  // which do not yet implement that language feature.
-                  .replace(/(^|[^\ud800-\udbff])([\udc00-\udfff])/g,
-                           function(_, previous, unpaired) {
-                              if (/[\udc00-\udfff]/.test(previous)) {
-                                  previous = code_unit_str(previous);
-                              }
-
-                              return previous + code_unit_str(unpaired);
-                           });
+        return str.replace(
+            /([\ud800-\udbff]+)(?![\udc00-\udfff])|(^|[^\ud800-\udbff])([\udc00-\udfff]+)/g,
+            function(_, low, prefix, high) {
+                var output = prefix || "";  // prefix may be undefined
+                var string = low || high;  // only one of these alternates can match
+                for (var i = 0; i < string.length; i++) {
+                    output += code_unit_str(string[i]);
+                }
+                return output;
+            });
     }
 
     function sanitize_all_unpaired_surrogates(tests) {
@@ -3612,6 +3606,9 @@ policies and contribution forms [3].
 
     function AssertionError(message)
     {
+        if (typeof message == "string") {
+            message = sanitize_unpaired_surrogates(message);
+        }
         this.message = message;
         this.stack = this.get_stack();
     }
diff --git a/tests/wpt/web-platform-tests/scroll-animations/progress-based-current-time.tenative.html b/tests/wpt/web-platform-tests/scroll-animations/progress-based-current-time.tenative.html
new file mode 100644
index 00000000000..8a8ccfcff8b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-animations/progress-based-current-time.tenative.html
@@ -0,0 +1,501 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>ScrollTimeline current time algorithm</title>
+<link rel="help" href="https://wicg.github.io/scroll-animations/#current-time-algorithm">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/web-animations/testcommon.js"></script>
+<script src="./resources/scrolltimeline-utils.js"></script>
+<script src="./testcommon.js"></script>
+
+<body></body>
+
+<script>
+'use strict';
+
+promise_test(async t => {
+  const scroller = setupScrollTimelineTest();
+  const scrollerSize = scroller.scrollHeight - scroller.clientHeight;
+  const blockScrollTimeline = new ScrollTimeline({
+    scrollSource: scroller
+  });
+
+  assert_equals(blockScrollTimeline.duration.unit, "percent",
+      "duration returns as a percent for scroll timelines");
+  assert_equals(blockScrollTimeline.duration.value, 100, "duration is 100%");
+}, "Scroll timeline correctly returns duration as 100%");
+
+promise_test(async t => {
+  const scroller = setupScrollTimelineTest();
+  const scrollerSize = scroller.scrollHeight - scroller.clientHeight;
+
+  const blockScrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'block'
+  });
+  const inlineScrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'inline'
+  });
+  const horizontalScrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'horizontal'
+  });
+  const verticalScrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'vertical'
+  });
+
+  // Unscrolled, all timelines should read a currentTime of 0.
+  assert_percent_css_unit_value_approx_equals(
+      blockScrollTimeline.currentTime, 0, 0, 'Unscrolled block timeline');
+  assert_percent_css_unit_value_approx_equals(
+      inlineScrollTimeline.currentTime, 0, 0, 'Unscrolled inline timeline');
+  assert_percent_css_unit_value_approx_equals(
+      horizontalScrollTimeline.currentTime, 0, 0,
+      'Unscrolled horizontal timeline');
+  assert_percent_css_unit_value_approx_equals(
+      verticalScrollTimeline.currentTime, 0, 0, 'Unscrolled vertical timeline');
+
+  // Do some scrolling and make sure that the ScrollTimelines update.
+  scroller.scrollTop = 50;
+  scroller.scrollLeft = 75;
+  // Wait for new animation frame  which allows the timeline to compute new
+  // current time.
+  await waitForNextFrame();
+
+  assert_percent_css_unit_value_approx_equals(
+      blockScrollTimeline.currentTime, 12.048, 0.01, 'Scrolled block timeline');
+  assert_percent_css_unit_value_approx_equals(
+      inlineScrollTimeline.currentTime, 18.072, 0.01, 'Scrolled inline timeline');
+  assert_percent_css_unit_value_approx_equals(
+      horizontalScrollTimeline.currentTime, 18.072, 0.01, 'Scrolled horizontal timeline');
+  assert_percent_css_unit_value_approx_equals(
+      verticalScrollTimeline.currentTime, 12.048, 0.01, 'Scrolled vertical timeline');
+}, 'currentTime calculates the correct time based on scroll progress');
+
+
+promise_test(async t => {
+  const scroller = setupScrollTimelineTest();
+  const scrollerSize = scroller.scrollHeight - scroller.clientHeight;
+
+  const lengthScrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'block',
+    startScrollOffset: CSS.px(20)
+  });
+  const percentageScrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'block',
+    startScrollOffset: CSS.percent(20)
+  });
+  const calcScrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'block',
+    startScrollOffset: CSS.percent(20).sub(CSS.px(5))
+  });
+
+  // Unscrolled all timelines should read a current time of 0, as the
+  // current offset (0) will be less than the startScrollOffset.
+  assert_percent_css_unit_value_approx_equals(
+      lengthScrollTimeline.currentTime, 0, 0,
+      'Unscrolled length-based timeline current time');
+  assert_equals(
+      lengthScrollTimeline.phase, "before",
+      'Unscrolled length-based timeline phase');
+  assert_percent_css_unit_value_approx_equals(
+      percentageScrollTimeline.currentTime, 0, 0,
+      'Unscrolled percentage-based timeline current time');
+  assert_equals(
+    percentageScrollTimeline.phase, "before",
+      'Unscrolled percentage-based timeline phase');
+  assert_percent_css_unit_value_approx_equals(
+      calcScrollTimeline.currentTime, 0, 0,
+      'Unscrolled calc-based timeline current time');
+  assert_equals(
+      calcScrollTimeline.phase, "before",
+      'Unscrolled calc-based timeline phase');
+
+  // Check the length-based ScrollTimeline.
+  scroller.scrollTop = 19;
+  // Wait for new animation frame  which allows the timeline to compute new
+  // current time.
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      lengthScrollTimeline.currentTime, 0, 0,
+      'Length-based timeline current time before the startScrollOffset'
+      + ' point');
+  assert_equals(
+      lengthScrollTimeline.phase, "before",
+      'Length-based timeline phase before the startScrollOffset point');
+  scroller.scrollTop = 20;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      lengthScrollTimeline.currentTime, 0, 0,
+      'Length-based timeline current time at the startScrollOffset point');
+  assert_equals(
+      lengthScrollTimeline.phase, "active",
+      'Length-based timeline phase at the startScrollOffset point');
+  scroller.scrollTop = 50;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      lengthScrollTimeline.currentTime,
+      calculateCurrentTime(50, 20, scrollerSize, 100), 0.01,
+      'Length-based timeline current time after the startScrollOffset point');
+  assert_equals(
+      lengthScrollTimeline.phase, "active",
+      'Length-based timeline phase after the startScrollOffset point');
+
+  // Check the percentage-based ScrollTimeline.
+  scroller.scrollTop = 0.19 * scrollerSize;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      percentageScrollTimeline.currentTime, 0, 0,
+      'Percentage-based timeline current time before the startScrollOffset'
+      + ' point');
+  assert_equals(
+      percentageScrollTimeline.phase, "before",
+      'Percentage-based timeline phase before the startScrollOffset point');
+  scroller.scrollTop = 0.20 * scrollerSize;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      percentageScrollTimeline.currentTime, 0, 0,
+      'Percentage-based timeline current time at the startScrollOffset point');
+  assert_equals(
+      percentageScrollTimeline.phase, "active",
+      'Percentage-based timeline phase at the startScrollOffset point');
+  scroller.scrollTop = 0.50 * scrollerSize;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      percentageScrollTimeline.currentTime,
+      calculateCurrentTime(
+          scroller.scrollTop, 0.2 * scrollerSize, scrollerSize, 100), 0.01,
+      'Percentage-based timeline current time after the startScrollOffset'
+      + ' point');
+  assert_equals(
+      percentageScrollTimeline.phase, "active",
+      'Percentage-based timeline phase after the startScrollOffset point');
+
+  // Check the calc-based ScrollTimeline.
+  scroller.scrollTop = 0.2 * scrollerSize - 10;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      calcScrollTimeline.currentTime, 0, 0,
+      'Calc-based timeline current time before the startScrollOffset point');
+  assert_equals(
+      calcScrollTimeline.phase, "before",
+      'Calc-based timeline phase at the startScrollOffset point');
+  scroller.scrollTop = 0.2 * scrollerSize - 5;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      calcScrollTimeline.currentTime, 0, 0,
+      'Calc-based timeline current time at the startScrollOffset point');
+  assert_equals(
+      calcScrollTimeline.phase, "active",
+      'Calc-based timeline phase at the startScrollOffset point');
+  scroller.scrollTop = 0.2 * scrollerSize;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      calcScrollTimeline.currentTime,
+      calculateCurrentTime(
+          scroller.scrollTop, 0.2 * scrollerSize - 5, scrollerSize,
+          100), 0.01,
+      'Calc-based timeline current time after the startScrollOffset point');
+  assert_equals(
+      calcScrollTimeline.phase, "active",
+      'Calc-based timeline phase at the startScrollOffset point');
+}, 'currentTime handles startScrollOffset correctly');
+
+promise_test(async t => {
+  const scroller = setupScrollTimelineTest();
+  const scrollerSize = scroller.scrollHeight - scroller.clientHeight;
+
+  // When the endScrollOffset is equal to the maximum scroll offset (and there
+  // are no fill modes), the endScrollOffset is treated as inclusive.
+  const inclusiveAutoScrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'block',
+    endScrollOffset: 'auto'
+  });
+  const inclusiveLengthScrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'block',
+    endScrollOffset: CSS.px(scrollerSize)
+  });
+  const inclusivePercentageScrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'block',
+    endScrollOffset: CSS.percent(100)
+  });
+  const inclusiveCalcScrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'block',
+    endScrollOffset: CSS.percent(80).add(CSS.px(0.2 * scrollerSize))
+  });
+
+  scroller.scrollTop = scrollerSize;
+  let expectedCurrentTime = calculateCurrentTime(
+      scroller.scrollTop, 0, scrollerSize, 100);
+
+  // Wait for new animation frame  which allows the timeline to compute new
+  // current time.
+  await waitForNextFrame();
+
+  assert_percent_css_unit_value_approx_equals(
+    inclusiveAutoScrollTimeline.currentTime, expectedCurrentTime, 0.01,
+    'Inclusive auto timeline at the endScrollOffset point');
+  assert_percent_css_unit_value_approx_equals(
+    inclusiveLengthScrollTimeline.currentTime, expectedCurrentTime, 0.01, 0.01,
+    'Inclusive length-based timeline at the endScrollOffset point');
+  assert_percent_css_unit_value_approx_equals(
+    inclusivePercentageScrollTimeline.currentTime, expectedCurrentTime, 0.01,
+    'Inclusive percentage-based timeline at the endScrollOffset point');
+  assert_percent_css_unit_value_approx_equals(
+    inclusiveCalcScrollTimeline.currentTime, expectedCurrentTime, 0.01,
+    'Inclusive calc-based timeline at the endScrollOffset point');
+}, 'currentTime handles endScrollOffset correctly (inclusive cases)');
+
+promise_test(async t => {
+  const scroller = setupScrollTimelineTest();
+  const scrollerSize = scroller.scrollHeight - scroller.clientHeight;
+
+  const lengthScrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'block',
+    endScrollOffset: CSS.px(scrollerSize - 20)
+  });
+  const percentageScrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'block',
+    endScrollOffset: CSS.percent(80)
+  });
+  const calcScrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'block',
+    endScrollOffset: CSS.percent(80).add(CSS.px(5))
+  });
+
+  // Check the length-based ScrollTimeline.
+  scroller.scrollTop = scrollerSize;
+  // Wait for new animation frame  which allows the timeline to compute new
+  // current time.
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      lengthScrollTimeline.currentTime, 100, 0.01,
+      'Length-based timeline current time after the endScrollOffset point');
+  assert_equals(
+      lengthScrollTimeline.phase, "after",
+      'Length-based timeline phase after the endScrollOffset point');
+  scroller.scrollTop = scrollerSize - 20;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      lengthScrollTimeline.currentTime, 100, 0.01,
+      'Length-based timeline current time at the endScrollOffset point');
+  assert_equals(
+      lengthScrollTimeline.phase, "after",
+      'Length-based timeline phase at the endScrollOffset point');
+  scroller.scrollTop = scrollerSize - 50;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      lengthScrollTimeline.currentTime,
+      calculateCurrentTime(
+          scrollerSize - 50, 0, scrollerSize - 20, 100), 0.01,
+      'Length-based timeline current time before the endScrollOffset point');
+  assert_equals(
+      lengthScrollTimeline.phase, "active",
+      'Length-based timeline phase before the endScrollOffset point');
+
+  // Check the percentage-based ScrollTimeline.
+  scroller.scrollTop = 0.81 * scrollerSize;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      percentageScrollTimeline.currentTime, 100, 0.01,
+      'Percentage-based timeline current time after the endScrollOffset point');
+  assert_equals(
+      percentageScrollTimeline.phase, "after",
+      'Percentage-based timeline phase after the endScrollOffset point');
+  scroller.scrollTop = 0.80 * scrollerSize;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      percentageScrollTimeline.currentTime, 100, 0.01,
+      'Percentage-based timeline current time at the endScrollOffset point');
+  assert_equals(
+      percentageScrollTimeline.phase, "after",
+      'Percentage-based timeline phase at the endScrollOffset point');
+  scroller.scrollTop = 0.50 * scrollerSize;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      percentageScrollTimeline.currentTime,
+      calculateCurrentTime(
+          scroller.scrollTop, 0, 0.8 * scrollerSize, 100), 0.01,
+      'Percentage-based timeline current time before the endScrollOffset point');
+  assert_equals(
+      percentageScrollTimeline.phase, "active",
+      'Percentage-based timeline phase before the endScrollOffset point');
+
+  // Check the calc-based ScrollTimeline.
+  scroller.scrollTop = 0.8 * scrollerSize + 6;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      calcScrollTimeline.currentTime, 100, 0.01,
+      'Calc-based timeline current time after the endScrollOffset point');
+  assert_equals(
+      calcScrollTimeline.phase, "after",
+      'Calc-based timeline phase after the endScrollOffset point');
+  scroller.scrollTop = 0.8 * scrollerSize + 5;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      calcScrollTimeline.currentTime, 100, 0.01,
+      'Calc-based timeline current time at the endScrollOffset point');
+  assert_equals(
+      calcScrollTimeline.phase, "after",
+      'Calc-based timeline phase at the endScrollOffset point');
+  scroller.scrollTop = 0.5 * scrollerSize;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      calcScrollTimeline.currentTime,
+      calculateCurrentTime(
+          scroller.scrollTop, 0, 0.8 * scrollerSize + 5, 100), 0.01,
+      'Calc-based timeline current time before the endScrollOffset point');
+  assert_equals(
+      calcScrollTimeline.phase, "active",
+      'Calc-based timeline phase before the endScrollOffset point');
+}, 'currentTime handles endScrollOffset correctly');
+
+promise_test(async t => {
+  const scroller = setupScrollTimelineTest();
+  const scrollerSize = scroller.scrollHeight - scroller.clientHeight;
+
+  const scrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'block',
+    startScrollOffset: CSS.px(20),
+    endScrollOffset: CSS.px(scrollerSize - 50)
+  });
+
+  scroller.scrollTop = 150;
+  // Wait for new animation frame  which allows the timeline to compute new
+  // current time.
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+      scrollTimeline.currentTime,
+      calculateCurrentTime(150, 20, scrollerSize - 50, 100), 0.01);
+}, 'currentTime handles startScrollOffset and endScrollOffset together correctly');
+
+promise_test(async t => {
+  const scroller = setupScrollTimelineTest();
+  const scrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'block',
+    startScrollOffset: CSS.px(20),
+    endScrollOffset: CSS.px(20)
+  });
+
+  scroller.scrollTop = 150;
+  // Wait for new animation frame  which allows the timeline to compute new
+  // current time.
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(scrollTimeline.currentTime,
+      100, 0.01);
+}, 'currentTime handles startScrollOffset == endScrollOffset correctly');
+
+promise_test(async t => {
+  const scroller = setupScrollTimelineTest();
+  const scrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'block',
+    startScrollOffset: CSS.px(50),
+    endScrollOffset: CSS.px(10)
+  });
+
+  scroller.scrollTop = 40;
+  // Wait for new animation frame  which allows the timeline to compute new
+  // current time.
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(scrollTimeline.currentTime, 0, 0.01);
+  scroller.scrollTop = 60;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(scrollTimeline.currentTime, 100, 0.01);
+}, 'currentTime handles startScrollOffset > endScrollOffset correctly');
+
+promise_test(async t => {
+  const scroller = setupScrollTimelineTest();
+  const scrollTimeline = new ScrollTimeline({
+    scrollSource: scroller,
+    orientation: 'block',
+    scrollOffsets: [CSS.px(10), CSS.px(20), CSS.px(40), CSS.px(70), CSS.px(90)],
+  });
+
+  var offset = 0;
+  var w = 1 / 4; // offset weight
+  var p = 0;         // progress within the offset
+
+  scroller.scrollTop = 10;
+  // Wait for new animation frame  which allows the timeline to compute new
+  // current time.
+  await waitForNextFrame();
+
+  assert_percent_css_unit_value_approx_equals(
+    scrollTimeline.currentTime, (offset + p) * w * 100, 0.01,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  p = (12 - 10) / (20 - 10);
+  scroller.scrollTop = 12;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+    scrollTimeline.currentTime, (offset + p) * w * 100, 0.01,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  offset = 1;
+  p = 0;
+  scroller.scrollTop = 20;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+    scrollTimeline.currentTime, (offset + p) * w * 100, 0.01,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  p = (35 - 20) / (40 - 20);
+  scroller.scrollTop = 35;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+    scrollTimeline.currentTime, (offset + p) * w * 100, 0.01,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  offset = 2;
+  p = 0;
+  scroller.scrollTop = 40;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+    scrollTimeline.currentTime, (offset + p) * w * 100, 0.01,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  p = (60 - 40) / (70 - 40);
+  scroller.scrollTop = 60;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+    scrollTimeline.currentTime, (offset + p) * w * 100, 0.01,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  offset = 3;
+  p = 0;
+  scroller.scrollTop = 70;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+    scrollTimeline.currentTime, (offset + p) * w * 100, 0.01,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  p = (80 - 70) / (90 - 70);
+  scroller.scrollTop = 80;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+    scrollTimeline.currentTime, (offset + p) * w * 100, 0.01,
+    "current time calculation when scroll = " + scroller.scrollTop);
+
+  scroller.scrollTop = 90;
+  await waitForNextFrame();
+  assert_percent_css_unit_value_approx_equals(
+    scrollTimeline.currentTime, 100, 0.01,
+    "current time calculation when scroll = " + scroller.scrollTop);
+}, 'currentTime calculations when multiple scroll offsets are specified');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/scroll-animations/testcommon.js b/tests/wpt/web-platform-tests/scroll-animations/testcommon.js
index d9fc153887c..9b3e82228fc 100644
--- a/tests/wpt/web-platform-tests/scroll-animations/testcommon.js
+++ b/tests/wpt/web-platform-tests/scroll-animations/testcommon.js
@@ -55,3 +55,11 @@ function assert_approx_equals_or_null(actual, expected, tolerance, name){
     assert_approx_equals(actual, expected, tolerance, name);
   }
 }
+
+// actual should be a CSSUnitValue and expected should be a double value 0-100
+function assert_percent_css_unit_value_approx_equals(actual, expected, tolerance, name){
+  assert_true(actual instanceof CSSUnitValue, "'actual' must be of type CSSUnitValue");
+  assert_equals(typeof expected, "number", "'expected' should be a number (0-100)");
+  assert_equals(actual.unit, "percent", "'actual' unit type must be 'percent'");
+  assert_approx_equals(actual.value, expected, tolerance, name);
+}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/find-range-from-text-directive-target.html b/tests/wpt/web-platform-tests/scroll-to-text-fragment/find-range-from-text-directive-target.html
new file mode 100644
index 00000000000..8e119d6448a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/find-range-from-text-directive-target.html
@@ -0,0 +1,71 @@
+<!doctype html>
+<title>Tests find-a-range-from-a-text-directive algorithm</title>
+<script src="stash.js"></script>
+<script>
+window.didScroll = false;
+
+function checkScroll() {
+  let results = {
+    didScroll: window.scrollY != 0
+  };
+
+  let key = (new URL(document.location)).searchParams.get("key");
+  stashResultsThenClose(key, results);
+}
+
+// Ensure two animation frames on load to test the fallback to element anchor,
+// which gets queued for the next frame if the text fragment is not found.
+window.onload = function() {
+  window.requestAnimationFrame(function() {
+    window.requestAnimationFrame(checkScroll);
+  });
+}
+</script>
+<style>
+  .spacer {
+    width: 50vw;
+    height: 200vh;
+  }
+</style>
+<body>
+  <div class="spacer"></div>
+  <p>
+    The quick brown fox jumped over the lazy dog.
+    a a b b b c
+  </p>
+  <p>
+    foo foo foo bar bar bar
+  </p>
+  <p>
+    Lorem
+
+    <br> <i>    </i>
+    <div>  &nbsp </div>
+    <!-- This <p> puts lots of non textual stuff between words -->
+    <div style="display: none">This isn't rendered</div>
+    <div style="visibility: hidden">This also isn't visible</div>
+    <iframe srcdoc="Inner Iframe"></iframe>
+    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII=">
+
+        &nbsp; &nbsp    Ipsum
+
+    Whitespace
+
+    <br> <i>    </i>
+    <div>  &nbsp </div>
+    <!-- This <p> puts lots of non textual stuff between words -->
+    <div style="display: none">This isn't rendered</div>
+    <div style="visibility: hidden">This also isn't visible</div>
+    <iframe srcdoc="Inner Iframe"></iframe>
+    <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAQAAAAnOwc2AAAAEUlEQVR42mNk+M+AARiHsiAAcCIKAYwFoQ8AAAAASUVORK5CYII=">
+        &nbsp; &nbsp
+
+    Dipsum
+
+
+
+  </p>
+  <p>
+    This text appears at the end of the document
+  </p
+</body>
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/find-range-from-text-directive.html b/tests/wpt/web-platform-tests/scroll-to-text-fragment/find-range-from-text-directive.html
new file mode 100644
index 00000000000..ce05a92b212
--- /dev/null
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/find-range-from-text-directive.html
@@ -0,0 +1,287 @@
+<!doctype html>
+<title>Tests find-a-range-from-a-text-directive algorithm</title>
+<meta charset=utf-8>
+<link rel="help" href="https://wicg.github.io/scroll-to-text-fragment/#find-a-range-from-a-text-directive">
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/common/utils.js"></script>
+<script src="stash.js"></script>
+<!--
+  This test suite performs scroll to text navigations to
+  find-range-from-text-directive-target.html and then checks the results, which are
+  communicated back from the target page via the WPT Stash server (see stash.py).
+  This structure is necessary because scroll to text security restrictions
+  specifically restrict the navigator from being able to observe the result of
+  the navigation, e.g. the target page cannot have a window opener.
+-->
+<script>
+// This test suite specifically exercises the "find a range from a text
+// directive" algorithm in the spec.
+
+let test_cases = [
+  {
+    fragment: '#:~:text=jumped',
+    expect_to_scroll: true,
+    description: 'Basic smoke test - full word match'
+  },
+  {
+    // Step 2.2.1
+    fragment: '#:~:text=u-,mped',
+    expect_to_scroll: false,
+    description: 'Prefix must start on a word boundary'
+  },
+  {
+    // Step 2.2.1
+    fragment: '#:~:text=ju-,mped',
+    expect_to_scroll: true,
+    description: 'Prefix need not end on a word boundary'
+  },
+  {
+    // Step 2.2.2
+    fragment: '#:~:text=null-,The%20quick',
+    expect_to_scroll: false,
+    description: 'Prefix doesn\'t exist'
+  },
+  {
+    // Step 2.2.3
+    fragment: '#:~:text=foo%20foo-,bar',
+    expect_to_scroll: true,
+    description: 'Multiple overlapping prefixes'
+  },
+  {
+    // Step 2.2.3
+    fragment: '#:~:text=a%20a-,b',
+    expect_to_scroll: true,
+    description: 'Multiple overlapping one letter prefixes'
+  },
+  {
+    // Step 2.2.4
+    fragment: '#:~:text=quick%20brown-,brown%20fox',
+    expect_to_scroll: false,
+    description: 'Prefix overlaps match text'
+  },
+  {
+    // Step 2.2.4
+    fragment: '#:~:text=quick%20brown-,fox',
+    expect_to_scroll: true,
+    description: 'Match text after prefix'
+  },
+  {
+    // Step 2.2.5
+    fragment: '#:~:text=Lorem-,Ipsum',
+    expect_to_scroll: true,
+    description: 'Search invisible content between prefix and match'
+  },
+  {
+    // Step 2.2.6
+    fragment: '#:~:text=end%20of%20the%20document-,test',
+    expect_to_scroll: false,
+    description: 'Prefix appears at end of document'
+  },
+  {
+    // Step 2.2.8
+    fragment: '#:~:text=fox-,jum,over',
+    expect_to_scroll: false,
+    description: '|end| forces |start| to end on word boundary'
+  },
+  {
+    // Step 2.2.8
+    fragment: '#:~:text=fox-,jum',
+    expect_to_scroll: false,
+    description: 'no |end| or suffix forces |start| to end on word boundary'
+  },
+  {
+    // Step 2.2.8
+    fragment: '#:~:text=fox-,jum,-ped',
+    expect_to_scroll: true,
+    description: 'suffix means |start| need not end on word boundary'
+  },
+  {
+    // Step 2.2.9
+    fragment: '#:~:text=jum-,ped',
+    expect_to_scroll: true,
+    description: '|start| doesn\'t need to start on word boundary'
+  },
+  {
+    // Step 2.2.10
+    fragment: '#:~:text=jumped-,null',
+    expect_to_scroll: false,
+    description: 'prefix with non-existent exact match'
+  },
+  {
+    // Step 2.2.10
+    fragment: '#:~:text=jumped-,null,lazy',
+    expect_to_scroll: false,
+    description: 'prefix with non-existent range match'
+  },
+  {
+    // Step 2.2.11
+    fragment: '#:~:text=brown-,jumped',
+    expect_to_scroll: false,
+    description: 'match doesn\'t immediately follow prefix'
+  },
+  {
+    // Step 2.2.11
+    fragment: '#:~:text=foo-,bar',
+    expect_to_scroll: true,
+    description: 'match doesn\'t immediately follow first prefix instance'
+  },
+  {
+    // Step 2.3.1
+    fragment: '#:~:text=jum,over',
+    expect_to_scroll: false,
+    description: 'no-prefix; |end| forces |start| to end on word boundary'
+  },
+  {
+    // Step 2.3.1
+    fragment: '#:~:text=jum',
+    expect_to_scroll: false,
+    description: 'no-prefix; no |end| or suffix forces |start| to end on word boundary'
+  },
+  {
+    // Step 2.3.1
+    fragment: '#:~:text=jum,-ped',
+    expect_to_scroll: true,
+    description: 'no-prefix; suffix means |start| need not end on word boundary'
+  },
+  {
+    // Step 2.3.2
+    fragment: '#:~:text=umped',
+    expect_to_scroll: false,
+    description: '|start| must start on a word boundary'
+  },
+  {
+    // Step 2.3.3
+    fragment: '#:~:text=null',
+    expect_to_scroll: false,
+    description: 'non-existent exact match'
+  },
+  {
+    // Step 2.3.3
+    fragment: '#:~:text=null,lazy',
+    expect_to_scroll: false,
+    description: 'non-existent range match'
+  },
+  {
+    // Step 2.3.4
+    fragment: '#:~:text=b%20b,-c',
+    expect_to_scroll: true,
+    description: 'overlapping exact matches with suffix'
+  },
+  {
+    // Step 2.3.4
+    fragment: '#:~:text=foo%20foo,-bar',
+    expect_to_scroll: true,
+    description: 'overlapping one letter exact matches with suffix'
+  },
+  {
+    // Step 2.4.1
+    fragment: '#:~:text=brown,fox',
+    expect_to_scroll: true,
+    description: 'matching range search'
+  },
+  {
+    // Step 2.4.1
+    fragment: '#:~:text=brown,quick',
+    expect_to_scroll: false,
+    description: 'inverted range search'
+  },
+  {
+    // Step 2.4.2
+    fragment: '#:~:text=quick,bro',
+    expect_to_scroll: false,
+    description: 'no suffix forces |end| to be end bounded'
+  },
+  {
+    // Step 2.4.2
+    fragment: '#:~:text=quick,bro,-wn',
+    expect_to_scroll: true,
+    description: 'suffix means |end| need not be end bounded'
+  },
+  {
+    // Step 2.4.3
+    fragment: '#:~:text=quick,ro,-wn',
+    expect_to_scroll: false,
+    description: '|end| must be start bounded'
+  },
+  {
+    // Step 2.4.3
+    fragment: '#:~:text=bro,wn',
+    expect_to_scroll: false,
+    description: '|end| must be start bounded even if full range is word bounded'
+  },
+  {
+    // Step 2.4.4
+    fragment: '#:~:text=quick,null',
+    expect_to_scroll: false,
+    description: 'non-existent |end|'
+  },
+  {
+    // Step 2.4.5
+    fragment: '#:~:text=quick,jumped,-fox',
+    expect_to_scroll: false,
+    description: 'Range with preceeding suffix'
+  },
+  {
+    // Step 2.6
+    fragment: '#:~:text=The-,quick,brown',
+    expect_to_scroll: true,
+    description: 'Match with no suffix'
+  },
+  {
+    // Step 2.7
+    fragment: '#:~:text=The-,quick,fox,-brown',
+    expect_to_scroll: false,
+    description: 'Suffix comes before |end|'
+  },
+  {
+    // Step 2.8
+    fragment: '#:~:text=Lorem-,Ipsum,Whitespace,-Dipsum',
+    expect_to_scroll: true,
+    description: 'Search invisible content between |end| and suffix'
+  },
+  {
+    // Step 2.9
+    fragment: '#:~:text=quick,-bro',
+    expect_to_scroll: false,
+    description: 'Suffix must be end bounded'
+  },
+  {
+    // Step 2.9
+    fragment: '#:~:text=qu,-ick',
+    expect_to_scroll: true,
+    description: 'Suffix need not be start bounded'
+  },
+  {
+    // Step 2.10
+    fragment: '#:~:text=quick,-null',
+    expect_to_scroll: false,
+    description: 'Non-existent suffix'
+  },
+  {
+    // Step 2.11
+    fragment: '#:~:text=quick,-fox',
+    expect_to_scroll: false,
+    description: 'Content appears between match and suffix'
+  }
+];
+
+for (const test_case of test_cases) {
+  promise_test(t => new Promise((resolve, reject) => {
+    let key = token();
+
+    test_driver.bless('Open a URL with a text fragment directive', () => {
+      window.open(`find-range-from-text-directive-target.html?key=${key}${test_case.fragment}`, '_blank', 'noopener');
+    });
+
+    fetchResults(key, resolve, reject);
+  }).then(data => {
+    const expectation_string = test_case.expect_to_scroll ? 'to scroll' : 'not to scroll';
+    assert_equals(data.didScroll, test_case.expect_to_scroll,
+                  `Expected ${expectation_string}`);
+  }), `${test_case.description}.`);
+}
+</script>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-attachment.tentative.html b/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-attachment.tentative.html
index 73b43829f1a..99a255bfa21 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-attachment.tentative.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-attachment.tentative.html
@@ -7,8 +7,6 @@
 <script src='../resources/shadow-dom-utils.js'></script>
 
 <script>
-document.allowDeclarativeShadowDom = true;
-
 const shadowContent = '<span>Shadow tree</span><slot></slot>';
 function getDeclarativeContent(mode, delegatesFocus) {
   const delegatesFocusText = delegatesFocus ? ' shadowrootdelegatesfocus' : '';
@@ -20,7 +18,7 @@ function addDeclarativeShadowRoot(elementType, mode, delegatesFocus) {
   const declarativeString = `<${elementType} id=theelement>${getDeclarativeContent(mode, delegatesFocus)}
      <span class='lightdom'>${lightDomTextContent}</span></${elementType}>`;
   const wrapper = document.createElement('div');
-  wrapper.innerHTML = declarativeString;
+  wrapper.setInnerHTML(declarativeString, {allowShadowRoot: true});
   const element = wrapper.querySelector('#theelement');
   return {wrapper: wrapper, element: element};
 }
diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html b/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html
index f17e304fe75..aaca71b9580 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-basic.tentative.html
@@ -14,8 +14,6 @@
 </div>
 
 <script>
-document.allowDeclarativeShadowDom = true;
-
 test(() => {
   const host = document.querySelector('#host');
   const c1 = host.querySelector('#c1');
@@ -34,14 +32,14 @@ test(() => {
 
 test(() => {
   const div = document.createElement('div');
-  div.innerHTML = `
+  div.setInnerHTML(`
     <div id="host">
       <template shadowroot="open">
         <slot id="s1" name="slot1"></slot>
       </template>
       <div id="c1" slot="slot1"></div>
     </div>
-    `;
+    `, {allowShadowRoot: true});
   const host = div.querySelector('#host');
   const c1 = host.querySelector('#c1');
   assert_true(!!c1);
@@ -55,12 +53,12 @@ test(() => {
 
 test(() => {
   const div = document.createElement('div');
-  div.innerHTML = `
+  div.setInnerHTML(`
     <div id="host">
       <template shadowroot="invalid">
       </template>
     </div>
-    `;
+    `, {allowShadowRoot: true});
   const host = div.querySelector('#host');
   assert_equals(host.shadowRoot, null, "Shadow root was found");
   const tmpl = host.querySelector('template');
@@ -71,12 +69,12 @@ test(() => {
 
 test(() => {
   const div = document.createElement('div');
-  div.innerHTML = `
+  div.setInnerHTML(`
     <div id="host">
       <template shadowroot="closed">
       </template>
     </div>
-    `;
+    `, {allowShadowRoot: true});
   const host = div.querySelector('#host');
   assert_equals(host.shadowRoot, null, "Closed shadow root");
   assert_equals(host.querySelector('template'), null, "No template - converted to shadow root");
@@ -84,12 +82,12 @@ test(() => {
 
 test(() => {
   const div = document.createElement('div');
-  div.innerHTML = `
+  div.setInnerHTML(`
     <div id="host">
       <template shadowroot="open">
         <slot id="s1" name="slot1"></slot>
     </div>
-    `;
+    `, {allowShadowRoot: true});
   const host = div.querySelector('#host');
   assert_equals(host.querySelector('#s1'), null, "Should be inside shadow root");
   assert_equals(host.querySelector('template'), null, "No leftover template node");
@@ -100,21 +98,21 @@ test(() => {
 
 test(() => {
   const div = document.createElement('div');
-  div.innerHTML = `
+  div.setInnerHTML(`
     <div id="host">
       <template shadowroot="open" shadowrootdelegatesfocus>
       </template>
     </div>
-    `;
+    `, {allowShadowRoot: true});
   var host = div.querySelector('#host');
   assert_true(!!host.shadowRoot,"No shadow root found");
   assert_true(host.shadowRoot.delegatesFocus,"delegatesFocus should be true");
-  div.innerHTML = `
+  div.setInnerHTML(`
     <div id="host">
       <template shadowroot="open">
       </template>
     </div>
-    `;
+    `, {allowShadowRoot: true});
   host = div.querySelector('#host');
   assert_true(!!host.shadowRoot,"No shadow root found");
   assert_false(host.shadowRoot.delegatesFocus,"delegatesFocus should be false without the shadowrootdelegatesfocus attribute");
@@ -122,13 +120,13 @@ test(() => {
 
 test(() => {
   const host = document.createElement('div');
-  // Root element of innerHTML is a <template shadowroot>:
-  host.innerHTML = '<template shadowroot=open></template>';
+  // Root element of setInnerHTML is a <template shadowroot>:
+  host.setInnerHTML('<template shadowroot=open></template>', {allowShadowRoot: true});
   assert_equals(host.shadowRoot, null, "Shadow root should not be present");
   const tmpl = host.querySelector('template');
   assert_true(!!tmpl,"Template should still be present");
   assert_equals(tmpl.getAttribute('shadowroot'),"open","'shadowroot' attribute should still be present");
-}, 'Declarative Shadow DOM: innerHTML root element');
+}, 'Declarative Shadow DOM: setInnerHTML root element');
 </script>
 
 <div id="multi-host" style="display:none">
diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html b/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html
index e023477c9f5..eb87fc95e71 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/declarative/declarative-shadow-dom-opt-in.tentative.html
@@ -56,97 +56,84 @@ function assert_dsd(el,shouldHaveShadow) {
 test(() => {
   const div = document.getElementById('mainpage');
   assert_dsd(div,true);
-  assert_false(document.allowDeclarativeShadowDom,'The default value for allowDeclarativeShadowDom should be false');
 }, 'Non-fragment parsing needs no opt-in');
 
 test(() => {
   const div = document.createElement('div');
   div.innerHTML = content;
-  assert_false(document.allowDeclarativeShadowDom,'The default value for allowDeclarativeShadowDom should be false');
   assert_dsd(div,false);
-  document.allowDeclarativeShadowDom = true;
-  div.innerHTML = content;
+}, 'innerHTML on element - disallowed');
+
+test(() => {
+  const div = document.createElement('div');
+  div.setInnerHTML(content);
+  assert_dsd(div,false);
+  div.setInnerHTML(content, {allowShadowRoot: false});
+  assert_dsd(div,false);
+  div.setInnerHTML(content, {allowShadowRoot: true});
   assert_dsd(div,true);
-  document.allowDeclarativeShadowDom = false; // Don't affect other tests
-}, 'innerHTML on element');
+}, 'setInnerHTML on element');
 
 test(() => {
   const templateContent = `<template id=tmpl>${content}</template>`;
-  assert_false(document.allowDeclarativeShadowDom,'Default allowDeclarativeShadowDom should be false');
   const div = document.createElement('div');
   div.innerHTML = templateContent;
   assert_dsd(div.querySelector('#tmpl').content,false);
-  document.allowDeclarativeShadowDom = true;
-  div.innerHTML = templateContent;
+  div.setInnerHTML(templateContent, {allowShadowRoot: true});
   assert_dsd(div.querySelector('#tmpl').content,true);
-  // Make sure to set back to avoid affecting other tests
-  document.allowDeclarativeShadowDom = false; // Don't affect other tests
-}, 'innerHTML on element, with template content');
+}, 'setInnerHTML on element, with nested template content');
 
 test(() => {
   const temp = document.createElement('template');
   temp.innerHTML = content;
-  assert_dsd(temp.content,false, 'innerHTML by default should not allow declarative shadow content');
-  assert_false(document.allowDeclarativeShadowDom,'The default value for document.allowDeclarativeShadowDom should be false');
-  assert_false(temp.content.allowDeclarativeShadowDom,'The default value for template fragment allowDeclarativeShadowDom should be false');
-  temp.content.allowDeclarativeShadowDom = true;
-  assert_false(document.allowDeclarativeShadowDom,'Setting template allowDeclarativeShadowDom shouldn\'t affect document.allowDeclarativeShadowDom');
-  temp.innerHTML = content;
-  assert_true(temp.content.allowDeclarativeShadowDom,'Setting allowDeclarativeShadowDom should persist across innerHTML set');
-  assert_dsd(temp.content,true, 'innerHTML should allow declarative shadow content if template.content.allowDeclarativeShadowDom is set');
-  temp.content.allowDeclarativeShadowDom = false;
-  document.allowDeclarativeShadowDom = true;
-  temp.innerHTML = content;
-  assert_false(temp.content.allowDeclarativeShadowDom,'Setting allowDeclarativeShadowDom should persist across innerHTML set');
-  assert_true(document.allowDeclarativeShadowDom,'document.allowDeclarativeShadowDom should still be set');
-  assert_dsd(temp.content,true, 'innerHTML should allow declarative shadow content if document.allowDeclarativeShadowDom is set');
-  document.allowDeclarativeShadowDom = false; // Don't affect other tests
-}, 'Setting template.innerHTML');
+  assert_dsd(temp.content,false, 'innerHTML should not allow declarative shadow content');
+  temp.setInnerHTML(content, {allowShadowRoot: true});
+  assert_dsd(temp.content,true, 'setInnerHTML should allow declarative shadow content if enabled');
+}, 'setInnerHTML on template');
 
 test(() => {
   const templateContent = `<template id=tmpl>${content}</template>`;
   const temp = document.createElement('template');
   temp.innerHTML = templateContent;
   assert_dsd(temp.content.querySelector('#tmpl').content,false);
-  document.allowDeclarativeShadowDom = true;
-  temp.innerHTML = templateContent;
+  temp.setInnerHTML(templateContent, {allowShadowRoot: true});
   assert_dsd(temp.content.querySelector('#tmpl').content,true);
-  document.allowDeclarativeShadowDom = false; // Don't affect other tests
-}, 'Setting template.innerHTML with nested template content');
+}, 'setInnerHTML on template, with nested template content');
+
+test(() => {
+  const div = document.createElement('div');
+  const shadow = div.attachShadow({mode: 'open'});
+  shadow.innerHTML = content;
+  assert_dsd(shadow,false);
+  shadow.setInnerHTML(content, {allowShadowRoot: true});
+  assert_dsd(shadow,true);
+}, 'setInnerHTML on shadowRoot');
 
 test(() => {
   const parser = new DOMParser();
-  let fragment = parser.parseFromString(content,'text/html');
+  let fragment = parser.parseFromString(content, 'text/html');
   assert_dsd(fragment.body,false);
-  assert_false(parser.allowDeclarativeShadowDom,'The default value for allowDeclarativeShadowDom should be false');
-  parser.allowDeclarativeShadowDom = true;
-  assert_false(document.allowDeclarativeShadowDom,'Setting allowDeclarativeShadowDom shouldn\'t affect document.allowDeclarativeShadowDom');
-  fragment = parser.parseFromString(content,'text/html');
+  fragment = parser.parseFromString(content, 'text/html', {allowShadowRoot: false});
+  assert_dsd(fragment.body,false);
+  fragment = parser.parseFromString(content, 'text/html', {allowShadowRoot: true});
   assert_dsd(fragment.body,true);
 }, 'DOMParser');
 
 test(() => {
-  const doc = document.implementation.createHTMLDocument("Document");
+  const doc = document.implementation.createHTMLDocument('');
   doc.body.innerHTML = content;
   assert_dsd(doc.body,false);
-  assert_false(doc.allowDeclarativeShadowDom,'The default value for allowDeclarativeShadowDom should be false');
-  doc.allowDeclarativeShadowDom = true;
-  assert_false(document.allowDeclarativeShadowDom,'Setting allowDeclarativeShadowDom shouldn\'t affect document.allowDeclarativeShadowDom');
-  doc.body.innerHTML = content;
+  doc.body.setInnerHTML(content, {allowShadowRoot: true});
   assert_dsd(doc.body,true);
-}, 'createHTMLDocument');
+}, 'createHTMLDocument with setInnerHTML');
 
 test(() => {
-  const doc = document.implementation.createHTMLDocument("Document");
+  const doc = document.implementation.createHTMLDocument('');
   let range = doc.createRange();
   range.selectNode(doc.body);
   let documentFragment = range.createContextualFragment(content);
   assert_dsd(documentFragment,false);
-  doc.allowDeclarativeShadowDom = true;
-  assert_false(document.allowDeclarativeShadowDom,'Setting allowDeclarativeShadowDom shouldn\'t affect document.allowDeclarativeShadowDom');
-  documentFragment = range.createContextualFragment(content);
-  assert_dsd(documentFragment,true);
-}, 'createContextualFragment');
+}, 'createContextualFragment - not supported');
 
 async_test((t) => {
   let client = new XMLHttpRequest();
@@ -157,49 +144,38 @@ async_test((t) => {
   }));
   client.open("GET", `data:text/html,${content}`);
   client.responseType = 'document';
-  assert_false(client.allowDeclarativeShadowDom,'The default value for allowDeclarativeShadowDom should be false');
   client.send();
 }, 'XMLHttpRequest, disabled');
 
-async_test((t) => {
-  let client = new XMLHttpRequest();
-  client.addEventListener('load', t.step_func_done(() => {
-    assert_true(client.status == 200 && client.responseXML != null);
-    assert_dsd(client.responseXML.body,true);
-    t.done();
-  }));
-  client.open("GET", `data:text/html,${content}`);
-  client.responseType = 'document';
-  client.allowDeclarativeShadowDom = true;
-  assert_false(document.allowDeclarativeShadowDom,'Setting allowDeclarativeShadowDom shouldn\'t affect document.allowDeclarativeShadowDom');
-  client.send();
-}, 'XMLHttpRequest, enabled');
+test(() => {
+  const div = document.createElement('div');
+  div.insertAdjacentHTML('afterbegin',content);
+  assert_dsd(div,false);
+}, 'insertAdjacentHTML on element - not supported');
+
+test(() => {
+  document.write(`<div id=doc-write-1 style="display:none">${content}</div>`);
+  assert_dsd(document.getElementById('doc-write-1'),true);
+}, 'document.write allowed from synchronous script loaded from main document');
+
+test(() => {
+  const doc = document.implementation.createHTMLDocument('');
+  doc.write(`<div id=doc-write-1>${content}</div>`);
+  assert_dsd(doc.getElementById('doc-write-1'),false);
+}, 'document.write disallowed on fresh document');
+
 
 async_test((t) => {
   const iframe = document.createElement('iframe');
   iframe.style.display = "none";
   iframe.sandbox = "allow-same-origin";
   document.body.appendChild(iframe);
-  iframe.addEventListener('load', t.step_func_done(() => {
-    assert_dsd(iframe.contentDocument.body,false);
-    t.done();
-  }));
-  iframe.srcdoc = content;
-}, 'iframe, disabled');
-
-async_test((t) => {
-  const iframe = document.createElement('iframe');
-  iframe.style.display = "none";
-  iframe.sandbox = "allow-same-origin allow-declarative-shadow-dom";
-  document.body.appendChild(iframe);
   iframe.addEventListener('load', t.step_func_done(() => {
     assert_dsd(iframe.contentDocument.body,true);
     t.done();
   }));
-  iframe.allowDeclarativeShadowDom = true;
-  assert_false(document.allowDeclarativeShadowDom,'Setting allowDeclarativeShadowDom shouldn\'t affect document.allowDeclarativeShadowDom');
   iframe.srcdoc = content;
-}, 'iframe, enabled');
+}, 'iframe');
 
 async_test((t) => {
   const iframe = document.createElement('iframe');
@@ -210,7 +186,7 @@ async_test((t) => {
     t.done();
   }));
   iframe.srcdoc = content;
-}, 'iframe, no sandbox - supports DSD by default');
+}, 'iframe, no sandbox');
 
 function getHandler(t, name, shouldHaveShadow) {
   return (e) => {
@@ -224,19 +200,14 @@ function getHandler(t, name, shouldHaveShadow) {
   };
 }
 async_test((t) => {
-  window.addEventListener('message', getHandler(t, 'iframe-disallow', false));
-}, 'iframe without allow-declarative-shadow-dom sandbox flag disallows declarative Shadow DOM');
-
-async_test((t) => {
-  window.addEventListener('message', getHandler(t,'iframe-allow', true));
-}, 'iframe with allow-declarative-shadow-dom sandbox flag allows declarative Shadow DOM');
+  window.addEventListener('message', getHandler(t, 'iframe-sandbox', true));
+}, 'sandboxed iframe allows declarative Shadow DOM');
 
 async_test((t) => {
   window.addEventListener('message', getHandler(t,'iframe-no-sandbox', true));
-}, 'iframe with no sandbox flag allows declarative Shadow DOM');
+}, 'iframe with no sandbox allows declarative Shadow DOM');
 
 </script>
 
-<iframe name="iframe-disallow" sandbox="allow-scripts" src="support/declarative-child-frame.html" ></iframe>
-<iframe name="iframe-allow" sandbox="allow-scripts allow-declarative-shadow-dom" src="support/declarative-child-frame.html"></iframe>
+<iframe name="iframe-sandbox" sandbox="allow-scripts" src="support/declarative-child-frame.html" ></iframe>
 <iframe name="iframe-no-sandbox" src="support/declarative-child-frame.html"></iframe>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/getinnerhtml.tentative.html b/tests/wpt/web-platform-tests/shadow-dom/declarative/getinnerhtml.tentative.html
index 2f8ecad418b..64fd78ba8ed 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/declarative/getinnerhtml.tentative.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/declarative/getinnerhtml.tentative.html
@@ -48,7 +48,7 @@ function testElementType(allowsShadowDom, elementType, mode, delegatesFocus) {
 }
 
 function runAllTests() {
-  const allElements = HTML5_ELEMENT_NAMES;
+  const allElements = [...HTML5_ELEMENT_NAMES, 'htmlunknown'];
   const safelisted = ATTACHSHADOW_SAFELISTED_ELEMENTS;
   for (const elementName of allElements) {
     const allowsShadowDom = safelisted.includes(elementName);
diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/setinnerhtml.tentative.html b/tests/wpt/web-platform-tests/shadow-dom/declarative/setinnerhtml.tentative.html
new file mode 100644
index 00000000000..f99863c7c1f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/shadow-dom/declarative/setinnerhtml.tentative.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<title>getInnerHTML </title>
+<link rel='author' title='Mason Freed' href='mailto:masonfreed@chromium.org'>
+<link rel='help' href='https://github.com/whatwg/dom/issues/831'>
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<script src='../resources/shadow-dom-utils.js'></script>
+
+<body>
+<script>
+function testElementType(allowsShadowDom, elementType) {
+  var t = test(t => {
+    // Create and attach element
+    const wrapper = document.createElement('div');
+    t.add_cleanup(function() { wrapper.remove(); });
+    document.body.appendChild(wrapper);
+
+    const html = `<${elementType}><template shadowroot="open"><slot></slot></template><span></span></${elementType}>`;
+    wrapper.setInnerHTML(html, {allowShadowRoot: true});
+    if (allowsShadowDom) {
+      // Retrieve shadow root
+      assert_true(!!wrapper.firstElementChild.shadowRoot,'No shadow root found');
+    } else {
+      const leftover = wrapper.firstElementChild.firstElementChild;
+      assert_true(wrapper.firstElementChild.childElementCount == 0 || leftover instanceof HTMLTemplateElement,'Template should be left over (or no children)');
+    }
+  }, `setInnerHTML() on <${elementType}>${allowsShadowDom ? `, with declarative Shadow DOM.` : ''}`);
+}
+
+function runAllTests() {
+  const allElements = [...HTML5_ELEMENT_NAMES, 'htmlunknown'].filter(item => item !== 'body');
+  const safelisted = ATTACHSHADOW_SAFELISTED_ELEMENTS;
+  for (const elementName of allElements) {
+    testElementType(safelisted.includes(elementName), elementName);
+  }
+}
+
+runAllTests();
+</script>
diff --git a/tests/wpt/web-platform-tests/streams/readable-byte-streams/general.any.js b/tests/wpt/web-platform-tests/streams/readable-byte-streams/general.any.js
index e384dbc5c79..8ae6af70efd 100644
--- a/tests/wpt/web-platform-tests/streams/readable-byte-streams/general.any.js
+++ b/tests/wpt/web-platform-tests/streams/readable-byte-streams/general.any.js
@@ -239,7 +239,7 @@ test(() => {
   const reader = stream.getReader();
   reader.read();
   assert_throws_js(TypeError, () => reader.releaseLock(), 'reader.releaseLock() must throw');
-}, 'ReadableStream with byte source: releaseLock() on ReadableStreamReader with pending read() must throw');
+}, 'ReadableStream with byte source: releaseLock() on ReadableStreamDefaultReader with pending read() must throw');
 
 promise_test(() => {
   let pullCount = 0;
diff --git a/tests/wpt/web-platform-tests/svg/animations/animated-classname-crash.svg b/tests/wpt/web-platform-tests/svg/animations/animated-classname-crash.svg
new file mode 100644
index 00000000000..5b28addfdd1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/animations/animated-classname-crash.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="blue">
+  <style>.v { fill: green }</style>
+  <g>
+    <set attributeName="class" to="v" begin="1s"/>
+    <rect width="100" height="100"/>
+  </g>
+</svg>
diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-1.html b/tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-1.html
index 9b45c5a8ca0..90a45efa320 100644
--- a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-1.html
+++ b/tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-1.html
@@ -34,26 +34,23 @@ rootSVGElement.appendChild(rect);
 
 // Setup animation test
 function sample1() {
-    // Check initial/end conditions
     assert_approx_equals(rect.width.animVal.value, 100, epsilon);
     assert_equals(rect.width.baseVal.value, 100);
 }
 
-function sample2() {
-    assert_approx_equals(rect.width.animVal.value, 0, epsilon);
-    assert_equals(rect.width.baseVal.value, 100);
-}
-
+// Per https://www.w3.org/TR/2001/REC-smil-animation-20010904/#ToAttribute
+// If any values (i.e., the argument-values for from, to, by or values attributes) are not legal,
+// the animation will have no effect
 smil_async_test((t) => {
     const expectedValues = [
         // [animationId, time, sampleCallback]
         ["animation", 0.0,   sample1],
-        ["animation", 2.0,   sample2],
-        ["animation", 3.999, sample2],
+        ["animation", 2.0,   sample1],
+        ["animation", 3.999, sample1],
         ["animation", 4.001, sample1]
     ];
 
     runAnimationTest(t, expectedValues);
 });
 
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-2.html b/tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-2.html
index 64d5884df44..f9a6bcc40d1 100644
--- a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-2.html
+++ b/tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-2.html
@@ -34,26 +34,23 @@ rootSVGElement.appendChild(rect);
 
 // Setup animation test
 function sample1() {
-    // Check initial/end conditions
     assert_approx_equals(rect.width.animVal.value, 100, epsilon);
     assert_equals(rect.width.baseVal.value, 100);
 }
 
-function sample2() {
-    assert_approx_equals(rect.width.animVal.value, 0, epsilon);
-    assert_equals(rect.width.baseVal.value, 100);
-}
-
+// Per https://www.w3.org/TR/2001/REC-smil-animation-20010904/#ToAttribute
+// If any values (i.e., the argument-values for from, to, by or values attributes) are not legal,
+// the animation will have no effect
 smil_async_test((t) => {
     const expectedValues = [
         // [animationId, time, sampleCallback]
         ["animation", 0.0,   sample1],
-        ["animation", 2.0,   sample2],
-        ["animation", 3.999, sample2],
+        ["animation", 2.0,   sample1],
+        ["animation", 3.999, sample1],
         ["animation", 4.001, sample1]
     ];
 
     runAnimationTest(t, expectedValues);
 });
 
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-3.html b/tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-3.html
index 0fb1794eaa2..1e16245001a 100644
--- a/tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-3.html
+++ b/tests/wpt/web-platform-tests/svg/animations/svglength-animation-invalid-value-3.html
@@ -34,26 +34,23 @@ rootSVGElement.appendChild(rect);
 
 // Setup animation test
 function sample1() {
-    // Check initial/end conditions
     assert_approx_equals(rect.width.animVal.value, 100, epsilon);
     assert_equals(rect.width.baseVal.value, 100);
 }
 
-function sample2() {
-    assert_approx_equals(rect.width.animVal.value, 0, epsilon);
-    assert_equals(rect.width.baseVal.value, 100);
-}
-
+// Per https://www.w3.org/TR/2001/REC-smil-animation-20010904/#ToAttribute
+// If any values (i.e., the argument-values for from, to, by or values attributes) are not legal,
+// the animation will have no effect
 smil_async_test((t) => {
     const expectedValues = [
         // [animationId, time, sampleCallback]
         ["animation", 0.0,   sample1],
-        ["animation", 2.0,   sample2],
-        ["animation", 3.999, sample2],
+        ["animation", 2.0,   sample1],
+        ["animation", 3.999, sample1],
         ["animation", 4.001, sample1]
     ];
 
     runAnimationTest(t, expectedValues);
 });
 
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/tools/certs/cacert.key b/tests/wpt/web-platform-tests/tools/certs/cacert.key
index 3a3e487a83d..1c1ca2bc110 100644
--- a/tests/wpt/web-platform-tests/tools/certs/cacert.key
+++ b/tests/wpt/web-platform-tests/tools/certs/cacert.key
@@ -1,30 +1,30 @@
 -----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIRu7scI+V5ZQCAggA
-MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECNDpjncoMek0BIIEyNdSEzeGgFTc
-2mdljspg2028EFpD6wAK7XbcoA8WHN81qkJA4a4XQQFgp4RID7DQc95ELs4awMLu
-SkY19F4VETrS0RvjPYIQkcOQMuPicVGrmH9cDptXv+IM24BuBXfj692B1ZNhE8Gd
-tHlRpSiSga7ja1635mJ4lcZsNJHiDVpEI/aIy+Xy/G5hHFcg+S22w797tuKxG2MZ
-PG9mnI1S/PF1KZbbJJZeZE2u60GxGQYiv3sOUOd4tNZqMLt2Nzo0JrjQJCwxFgFK
-7EzRrN41G2IuSuSMSrn9CEADbvB1hgDWEgc8tW4jE28d9NhoiI+Lwzq33WBN6tyG
-oJly36w8J0VNBqhqQSLzwAQ+ChT2/a59GJ4R5LvFCP2AxDGkag1iN5FdQ96aIoCA
-zAevHtDNmGvj44qpkAiRlACiFjYXK7vR9ZiB+CIhe0dxm9kYCce9S2Du3541a//P
-2YtfjScV3mma21e+xUMPzgNR+p8O9OY2DSMi3m56cXFfR5eoKAFvBUalOBjJu9Wp
-k9dpLZlbE8qBd8plEjnq3ie3+DSkWOaq8KI4OeBa0ZyE6kRnC+2qYQ2aafGq/y5d
-o8V/P9xpvZJfH/QsFpaQM9TP3biI8wdN1w+uU5ZX/g9zpgkVSBR4jVWbjmSdpcN8
-IdVNIohLZDtSSGDA+yzG+T/3tloS7uB3dIQgjqINcJqp3l6W8chbjZoe2WDAJH6u
-F+VthCo82dTgDpn+yPWsKNTyJc9B4bbCgHkZCjX0ENksJt22Oi9Bq2+uCU9RdKZ8
-KxL37OlqAwLvDg8XgV/ox3lzcMmSR/Y1xY5XdUS4crsXcSZMtakEHlYt9U2s8SsH
-WqdiUrdTC7YJHReJ/FhooEo9Tk4bfxJtSeOJMvzHkE14jRW/ovy1tYCpyJI7Q+Dy
-9z++hi/DuNusWoHjw3KLOtPST2o/YduBPGBK88sPEVUIZXdJ/JLe1CQGb+1IuKxw
-XADhNMIGW31i5uoaM7eVgRM5oZ6FUhK356vBgJVu39qStBuc8dq19lu0iOfgtVWY
-WEQd7PuwJnZrcpz6YiPHTrtCDApPT53RnuYJgPlDGkW/yUkjZk8Qzcg4yes4zZaT
-Zkts/BiGtQ4bgTkOZtwE8xCI+NZTnhWyIyMk+us2fSvJJGEsnBtJ8PO5XwoZvHxQ
-DMP4MoaZt1/TV5TXMYel/shvpCWIbKFVG9npk3bomC2ApUJbNlrvOKrxS5vaVd1i
-bZXigYZcynDYSsY4RI8jK3nSp2uR8C4YCaBU1ws0uj0ZAvY+SxuYSQTEs1eQd0ra
-QMOlhmUAydHkP+kT2zUTYa4uFn2F/KMhQ/r2nAtpgG/wT6gYeOz5bi8bGl6+dfvU
-9HT6JWFNOKaFVTVvlu32VGpe4nbUszVQlgXLu+1tHL4K0yRgLL6nGpLH31U4M9YV
-T+aJGjCBEsH56ipMMy0Ke/NfJyfwG+HEkg9EXK+re+1zsm4vWI5Aru4eApN3Im+N
-TnIE7y5OZCQEYgolZotzvPoXDAesofRpt2RoAMNIL/pRZZGKG+6bojq0AIrKi6rp
-6y2nF3NjSjGBM8K2FIsj2ORchbGzw3zu4QOBsMfLO32/SheMhaytqPVt3Pkss5xb
-ivBI1FNVMcGJYA9S+4ZF3Q==
+MIIFHDBOBgkqhkiG9w0BBQ0wQTApBgkqhkiG9w0BBQwwHAQIcASKD0ss81ECAggA
+MAwGCCqGSIb3DQIJBQAwFAYIKoZIhvcNAwcECGBV6uUfaaIYBIIEyBtxKGR+s9bP
+GXpgttZpWXUqeEh1QUhgHgH7f21v81x4t7Svy3esSn65UCaBUN/aqcPA31fcEmqX
+Lv4PbOZoGMvoJTzZSNEpuOAAZam2FdA6fbULLB42cfu3YiZYGApJsL9aRIYxBcGa
+b/qhAK8rgAIWi+cR405O+23ga9AtEvzWJ08JX5vGmPb/ZsQmEfeQX1IQzl0Bh+2D
+To8iviHlbb78Io7OiLcVv8Ds7O+7Ib0hxFCdurEkUqqVf+UC8NAE3qWrsZuSZbhj
+SkJFN1Ks82zM2TMAjQpNfFG5eHvkeRVUgLWbeV7cYigZYbRkkElrZOe6AL5ebuO3
+dz6RX4q9G2Hz/SfLfuKL+spI4/9Ya+bmsik2fPWJ4kdSwKItx9JtMaCSv1m44ElE
+gZGYE+N97+O9u888fiy1ob8JRCJZZi2KAOZkUYE7WHWk9vZCg6uSpAxFJcxOdxG/
+H5XCt/+iNOOTlqT2UCH5YZIblgU+tvt1tq/JSAUCfJPGMBCmiVz2ifs5bKerE7+b
+PMxoRHBaPMYS4rg0wgWNjZW8MVLGGaVzjfzIZwwcGyI3Lm48m+q3iuevjc9KvIYb
+L89ntnwQUA5T+NT3hSnKimXbc7XOu483T0/NEfGOSDzCF/qfTRCnVz+YqdjkXKXh
+5bd3NPz+MSLHkk0FFEorCNiOSDylIzzOu986uskgVtF79ixX71a+nBt5g0HpRbk+
+9cT8qKXvZN8YYXtrznbUVrdCK8EwmnAicZ0+ZkAYb8Pg5LaFg75sNnWsCQ/2ZWgs
+2+u4QtTNzKvmC7WaKi5SpAm5SJcxVzHSbdDLVMCV6eVyeJAuiRNR2ZByEfOeyNRY
+c3N38L4rquop41XGnorbt7n0EyU6j8yd0HmPQeJP/wNTh9E8lntkTbuxziht03YJ
+Qtk9a9vF9iQfoLpYd1VspPDLO7whn+2kGc8E2zJJlSsXVK8WhiQIPM0HOFN+OPBc
+INYYTrijuail+bAt+PeXmd2bnrCABr7o64v0h7cHmx+Yngc3OWzhtMXlk7/r/skP
+s0dEtr3BkD8iiKkHVvkqN4MCqkwc2H6Z1fV9uDhUv/dJIUsYWvLpvhY+QGv+R+5U
+yfnbRhHZPfAIzkbvKbuc7/bKvLOeCDSTF1pHnjiAQgE3lFsXLsfZ/9ViwFZ4/0Tu
+LR8Sv5pWxAc0qTYh3qyTLqgNlBfNgrYyf/PqiTIZpMqOnJkiX+VvkG/O+fMQMcLL
+JeZ7okF8TMqft9pWsgMZOcDLWyv4UFuwYNauEKJUjZAJ9L8O4dO74MYfR0c1fiMg
+27n6N6nt7bya7HzidHJx5cmGP6zCb1DLkdF3/2r/MYG9ciGodfwudfFRLZdeO6qs
+I3r1K9htN3zfr44aEJwzCOq5nXY7kGOeqdOzrODm67V2Y/poo17cEtgJuBEH5EW3
+E2PjNP1E2rmO7WcdlY69H4r280IzU1y/nmYzcYaVailQbJnBiDewty/KDAH9z/YN
+Bmf+xoDbuxcaFJC9SBe2H2pP0F+rjxn1vRwItPNa920HLgzyGw/LzEXodIk7nbDi
+Qkxxv3tM42R02iKRoQJsCE808KukBaNXRxdWmHXrvizgb4x5bgF9wceeE2uyGKt6
++gCql5qVVIvmTmSQxwZ7aw==
 -----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/wpt/web-platform-tests/tools/certs/cacert.pem b/tests/wpt/web-platform-tests/tools/certs/cacert.pem
index e9b5fda55c3..a9383d0cf00 100644
--- a/tests/wpt/web-platform-tests/tools/certs/cacert.pem
+++ b/tests/wpt/web-platform-tests/tools/certs/cacert.pem
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIJAhzCCP2+gAwIBAgIDDeufMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
-Yi1wbGF0Zm9ybS10ZXN0czAeFw0yMDEwMTIwMDMwNDdaFw0yMTEwMTIwMDMwNDda
+MIJAhzCCP2+gAwIBAgIDC40VMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
+Yi1wbGF0Zm9ybS10ZXN0czAeFw0yMDExMTIwMDIwNTNaFw0yMTExMTIwMDIwNTNa
 MB0xGzAZBgNVBAMMEndlYi1wbGF0Zm9ybS10ZXN0czCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAOGkP/wDuZaB5F+dyDND3yegR0+uA/PsPzKcpALwjr6G
-AkEWSqOp1H5pLtV0L+VuFJM7k9OhihrX9gQF3NG2oViUo8FY0u90NQUOFOpKaiol
-pQEtC0nW7RJME9i6OqHp8oEVEUmTN3sgXnmLznO/EVpbjs7gEV8bdvIUeg224I9D
-Ly7QcF90GHWHjp9SI7EbODhbE7oB07l55/ddTsjCQE32KAdzLMLrowIvfMHtGIG7
-DKtEzM4muXaHJImDJdiXLdv64ZlbpwjwqhEzNBdfGhPnEqCqDK0/Gqn5VfS+UzcD
-/uQrMWsoL/oUrwTztk2uI+zcKYCXooKlEvzAQmNlXmcCAwEAAaOCPc4wgj3KMAwG
-A1UdEwQFMAMBAf8wHQYDVR0OBBYEFIFuwBVBQHcPDDoei++ltCM0KtQPMEcGA1Ud
-IwRAMD6AFIFuwBVBQHcPDDoei++ltCM0KtQPoSGkHzAdMRswGQYDVQQDDBJ3ZWIt
-cGxhdGZvcm0tdGVzdHOCAw3rnzALBgNVHQ8EBAMCAgQwgh+bBgNVHR4Egh+SMIIf
+BQADggEPADCCAQoCggEBALdnLr4euIqNu/fGFriDJAA2QT4m8q196Ur22hKKvbzf
+ybjM/Ux1DwRDBvFjEmjyAnBgfMhYjGHG61SSz75qHONwHleStZlApMw6aA3izKwT
+EjwK8Lcd2YOPOWOwPXlURo9WC6f/U0NAwQ52+gg3Iru7XoY1Lpf6EyIs1SJwbqG+
+u1zPIw+z4DDinHdq2/zjvVuSqkgItj7wirTbUAeyZbIf+Bm+4QUzsUU7pWQGa/e6
+zEaV2iDh0HQS1H8FJsOx9eL0F1nEt3Ca/e0YYU6BRarESVRXKEVlOGov/WFe/3LL
+hzEVQDA69LT3U6FcW29risXcTs52Zb14GoTBSGGG+b8CAwEAAaOCPc4wgj3KMAwG
+A1UdEwQFMAMBAf8wHQYDVR0OBBYEFCWPU0qvGY1M+UVUpbjsIRzEY8uiMEcGA1Ud
+IwRAMD6AFCWPU0qvGY1M+UVUpbjsIRzEY8uioSGkHzAdMRswGQYDVQQDDBJ3ZWIt
+cGxhdGZvcm0tdGVzdHOCAwuNFTALBgNVHQ8EBAMCAgQwgh+bBgNVHR4Egh+SMIIf
 jqCCH4owE4IRd2ViLXBsYXRmb3JtLnRlc3QwF4IVb3A4LndlYi1wbGF0Zm9ybS50
 ZXN0MBeCFW9wNy53ZWItcGxhdGZvcm0udGVzdDAXghVvcDkud2ViLXBsYXRmb3Jt
 LnRlc3QwF4IVb3A0LndlYi1wbGF0Zm9ybS50ZXN0MBeCFW5vdC13ZWItcGxhdGZv
@@ -337,11 +337,11 @@ d2ViLXBsYXRmb3JtLnRlc3SCOnhuLS1sdmUtNmxhZC54bi0tbjhqNmRzNTNsd3dr
 cnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3SCQXhuLS1uOGo2ZHM1M2x3d2ty
 cWh2MjhhLnhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLndlYi1wbGF0Zm9ybS50ZXN0
 gkV4bi0tbjhqNmRzNTNsd3drcnFodjI4YS54bi0tbjhqNmRzNTNsd3drcnFodjI4
-YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwDQYJKoZIhvcNAQELBQADggEBABV0Fdd4
-mBYcpepIDsw0Rg9kVA1xrusuCBvJBmHEAiBT0BjPuPqKmVnSHeKKN9yPb+MoZpVV
-p9sYK1dsvg7k7Ps9n/kUR5DaYXFS0L6C13ai9b8KSXbfcIpORj7khtw3q2c7mXBT
-WJG773rl9d4JKgzUHxMxOssqWgFyVDI6iVIIKtwTcPgkwjIkzmSDXmzKG3U3y+G1
-uusX8OITz2YbmE/gPUNEwUUb8wG2YvSxlql5oTltAmO0B7OLKxTJ6xb80/3NWt14
-A1pe742p7fz2ECPBx/wHjvbFf2jkMgtRzWK1+A9aXAJnZnZhKBfW/MNP5J4AiRnY
-ssVE+rp8r8RdHXg=
+YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwDQYJKoZIhvcNAQELBQADggEBADI9ECYU
+bk74fmKwJMWPy4fR8JWIL44Fg8Gng0zNcUSDGwh3vQGb+IQQSHMV9/BhRIAuPInB
+K6z9wGZRgSMUROci87G/NqJo86YP84CwQy/uiW11SgO5EIPD3qQh1Ytk3VOf4SUf
+zn+ewYwCTGfV6eQND/I40t9ZfAUtvPyI0D4Q1glTOZJV6nkaVJL6vCJhUrPWMRAe
+wrJq+z/N80/EA9YlB6m2nJNuPGCng2ckacdo0Xq+op4hqTTYFmfvBXrCR7/oeP5z
+VwFUBdqee2rsnBpFcgBKd0+7LoG4M0GYvbtgkILOAgjpZGni1U5bUumaLApzfYEt
+hEFv2hJH8ccY+C0=
 -----END CERTIFICATE-----
diff --git a/tests/wpt/web-platform-tests/tools/certs/web-platform.test.key b/tests/wpt/web-platform-tests/tools/certs/web-platform.test.key
index 957dfb234f8..4e557404ab2 100644
--- a/tests/wpt/web-platform-tests/tools/certs/web-platform.test.key
+++ b/tests/wpt/web-platform-tests/tools/certs/web-platform.test.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCru8v0H5Ka2NPG
-WVV5Y0h9ER/9ynCLLSmy/jHjcvYtwNpAfSgHum1CbWze9yE7bNaQ9FXbA33V3cnh
-0gzUyOK81yxcU5VkKpyNJcYFB/pjOMB66rS2QDR2PErJTduh1y3sX6JbK1aAQ8ac
-SnFXMz2L28swmXgmFYmCxWHB8xVsPR5xqIav5cnjQyVfi7BlcZCUajExvugkEtjt
-ckSZzBKmyLYWIjVcEIwUaapEyts1mEJL2qQHRoEHVskow12VuPOanIhpBcmrDIRl
-pnThZuHZO/aOeKWG9sKFVfCORAUru+3/udXRbBLQLmpBZiWO8F1EuLNqUhsWx/bF
-sn9630EPAgMBAAECggEAQad/NqpnYvmoJPl8Ovcg/GdyopUlZ5/xhDO4IOuPgDht
-eCAhEKtOIAoziB5UvyJB+ZLfy+ZO0leDWejy7NqMDIP6uqVdxLihtziMttmw+QP2
-WkempNJw/A7azJEOeZYJQYfiSxaLcGf440F2iU7WpcR2rvLNQ0oSk0Mgt4RWWVV4
-FU4A9cgJ4++KhAtlCyskDG+ZoFEj4O93WXqaO/oF8Y/+mjD7xoLwm5o8U1E00FZQ
-OQkJ26obLfOQRcbs3ZtLcqsbZl46DzmmG8Ddpdst2Y8hkeMPfI83i4xu2b5uj+wO
-SZqwcHo4oRGEQEUj4WGnN9ZjVa9AWcDNAY63/FvT0QKBgQDWOwfYzsdG3/R3TQ0X
-7Vq7tgYLDoWVFRs2O1vbE+/+f6zRyCo84IvKd4KFG/mlcZr6Odo6H2HSnQiRX4/w
-LGjG+prAql90IODZljgYXEKuQeseHz6hHAL/k9gKHSOSmGmw5MmOw4TUuII0+oc+
-5eArXjuu9SX2AC935ir3vYEQlwKBgQDNN5jxHORGdtJ92Yr/rkVUSRir5/7OhBjz
-s2K60/hSHbWfejmWgGpqEEp9qHBYuXGPuORWR/A37qp61w3Hi3/Wp7nJcjn7sUQK
-9phZ8BmmW2FIvC22J8ui33fjX/Vbbd4ihdBonf6G9fvpZ1kkU/n8co3dRdQkGNzI
-IQ6kJMVqSQKBgQC8hjw0jluNwn33EsZn/Qdw0xFkX4YsmONWiUwfcd8sPp0OC7En
-248JQLyKeQDrmBsDAzBJH97NIkYs8ETR3bLjEBxpWkUgA+L7eBerUF2Zzgajfml2
-DBmTYj6nP9dTJW81LVE2olbdf/WNu76TGmZ4o7ewEqoyXx1mzRWY6JqQxwKBgQDC
-0J/hbSML/asPi+BXnxHz1LyWHVQYqvChEU+NusLG+as8rSRUSq466CI/LhMRN2Km
-JMinW/2gq3Kt0NAk+bovheRqZ4TB+mN04Op6nuNKuP8etH3Uqey4PtqqQKNE24UA
-UvYpCqvhZU1zIwhN42azD/C6+ZpNdkjJuBAVJU8/+QKBgAgr39s68Zw8esPv3AmP
-7Qx+D9hleD07xm3iHD0EU/WK3IW2TqUN2VpL3lpkucH3M0v1dm49+T3NQw524NJK
-nfytgCa+RERmo8t/epJG6dWZgesUniiSvAckGriZjcsgOExYyHe7vu1dHOLeU2S/
-NDKR7frgEU7EiGtNQEa8ucLD
+MIIEuwIBADANBgkqhkiG9w0BAQEFAASCBKUwggShAgEAAoIBAQDJ5znW1OiuaVzS
+BqGsIGNjixbjYO3pSf/3xsW7V9Hc9QZJ4RP5Rt1U8n+3/vFwH6ks5Wfdo2vWrRsB
+x8Z07l+b9FJF35i0kAJ9JPhAWaxg3agj0Aj/pYdlzEioXmkOD4pCSHrnKBQTkAne
+4qT6D5yoigvk/BXZ7WmnRM6IetnDmbttgnPVlKqhRU5rdZH4Rw+YtIML6hZ9Vmw3
+I3Ovo/o2wStKFcIuBe4IvC1ohMYgueP2vbHhab+tT9J6BnXCPhJdmL4L6UKYca6I
+sO32+mLxITT0NeHi0O910G8Dz6CgazYTtbuF27494q8y5hkXtbuPmxWZvr1vtdnK
+YX3acocHAgMBAAECgf8mpRttA1OGDqS1jo9jYs+jPfwjiWoAPSnBQ0qVkTmaEUwi
+1/H6xJWYrNHFZgbQbz7yWPaIdb8uV/PTY2mY+AdU0m7s8N9JsEbJrUnXB1L3N3X3
+ZNpUFFrWIUPG9kslZdQQ286qcAFnvSomfzsUoehaWhHswlNsYwTV/1WIyfrkdTFg
+Q//fpWJx4OaRWGwqf0Ld9Iab3FtJSeMQcoHyJSOeMPbbFhxJg38f3TdJMpQw4dHA
+97FkUyMFcuX9705DjiBmwyWEFNQAMdMxTX2I3dy1EexIdrK2vJJ9KykM6gCUazuu
+AXmJwakpnaAoYmjDSZBTB+9VEeK5ETN/MgchofECgYEA5rEApE+zNqiotWJnsTIt
+IUFdxv+i5VjQMfJzPIBgpqpjC35lqtaDnhRJ3omRAJgFQa5XIBJkOmsDGewbxGOi
+3nI/SXe5c3NpbOBvTIF3Mbgfok9KFVmnpDqHs6p0gShEn6CXJrXwNdfkVFnKUrRQ
+7vOPhV/K2dIeBAvQzk+ViMkCgYEA4A20F/A466jetgz+QV4IBo+tf6HEwqj9fFfX
+Bhwt+/hbFRnKY8H2YYTZBPGwj0Jg/QBfAt6aRMHaM6OvqxtqJHj9xreRRuD+t8wp
+KiVHpmMoE2lugnc3eRLXoBUMeu4dHcV2lzH6KsfQcO30Pcg+hX7QvVlGV6MQZRVP
+QB7sSU8CgYEAvz8AFDfKj8a0zmJ9KiY5ybcCAmaNaer99lpT9FVNSv44TCAGMuHR
+jWyubKHJJx/gQ7o/mmQE2XU7xfK6dk5PiHBYTRTHFpIYVV2eh2NRKFPHTezDsv13
+gCvRsj3ehfCXK2qbxEjSkiCfttoVZAj+i4o5ck2ewoNxxNLy0QajJhkCgYB5+9v+
+YIKNA27lzSMssaZK9DSw1YFLvjfsV+Kw5+y9T5U/YsBHGdYrd+m0AGZxSOGHPYl9
+BXcWUjibftXooc9jNiBs7YqB/YOQy+3pjUx6MWgjUXaiP4gLOg/9jxgxYaymhdiw
+LryWSB2bLmKYtIodolLBlHZwxk3pyvVP4sYgjwKBgCTf5wCibgaa6EjR6NewsFgU
+NPOXBvCEHXQENNBCWPPJZL1a6RJ48TZijMTzIa4S0m+AP3+g8vdFQ7X9uxRC/gfV
+5mWogHtK14dY07WMi8TJogJwoufukedrI5vtbQh3Rijty1Vwz7/Fcq/dgG3sFMzw
+7TjzYF4FIkYUQSzG/GP5
 -----END PRIVATE KEY-----
diff --git a/tests/wpt/web-platform-tests/tools/certs/web-platform.test.pem b/tests/wpt/web-platform-tests/tools/certs/web-platform.test.pem
index 61d7e4d1892..7c58aa67f0a 100644
--- a/tests/wpt/web-platform-tests/tools/certs/web-platform.test.pem
+++ b/tests/wpt/web-platform-tests/tools/certs/web-platform.test.pem
@@ -1,43 +1,43 @@
 Certificate:
     Data:
         Version: 3 (0x2)
-        Serial Number: 912288 (0xdeba0)
+        Serial Number: 757014 (0xb8d16)
         Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=web-platform-tests
         Validity
-            Not Before: Oct 12 00:30:47 2020 GMT
-            Not After : Oct 12 00:30:47 2021 GMT
+            Not Before: Nov 12 00:20:53 2020 GMT
+            Not After : Nov 12 00:20:53 2021 GMT
         Subject: CN=web-platform.test
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
                 RSA Public-Key: (2048 bit)
                 Modulus:
-                    00:ab:bb:cb:f4:1f:92:9a:d8:d3:c6:59:55:79:63:
-                    48:7d:11:1f:fd:ca:70:8b:2d:29:b2:fe:31:e3:72:
-                    f6:2d:c0:da:40:7d:28:07:ba:6d:42:6d:6c:de:f7:
-                    21:3b:6c:d6:90:f4:55:db:03:7d:d5:dd:c9:e1:d2:
-                    0c:d4:c8:e2:bc:d7:2c:5c:53:95:64:2a:9c:8d:25:
-                    c6:05:07:fa:63:38:c0:7a:ea:b4:b6:40:34:76:3c:
-                    4a:c9:4d:db:a1:d7:2d:ec:5f:a2:5b:2b:56:80:43:
-                    c6:9c:4a:71:57:33:3d:8b:db:cb:30:99:78:26:15:
-                    89:82:c5:61:c1:f3:15:6c:3d:1e:71:a8:86:af:e5:
-                    c9:e3:43:25:5f:8b:b0:65:71:90:94:6a:31:31:be:
-                    e8:24:12:d8:ed:72:44:99:cc:12:a6:c8:b6:16:22:
-                    35:5c:10:8c:14:69:aa:44:ca:db:35:98:42:4b:da:
-                    a4:07:46:81:07:56:c9:28:c3:5d:95:b8:f3:9a:9c:
-                    88:69:05:c9:ab:0c:84:65:a6:74:e1:66:e1:d9:3b:
-                    f6:8e:78:a5:86:f6:c2:85:55:f0:8e:44:05:2b:bb:
-                    ed:ff:b9:d5:d1:6c:12:d0:2e:6a:41:66:25:8e:f0:
-                    5d:44:b8:b3:6a:52:1b:16:c7:f6:c5:b2:7f:7a:df:
-                    41:0f
+                    00:c9:e7:39:d6:d4:e8:ae:69:5c:d2:06:a1:ac:20:
+                    63:63:8b:16:e3:60:ed:e9:49:ff:f7:c6:c5:bb:57:
+                    d1:dc:f5:06:49:e1:13:f9:46:dd:54:f2:7f:b7:fe:
+                    f1:70:1f:a9:2c:e5:67:dd:a3:6b:d6:ad:1b:01:c7:
+                    c6:74:ee:5f:9b:f4:52:45:df:98:b4:90:02:7d:24:
+                    f8:40:59:ac:60:dd:a8:23:d0:08:ff:a5:87:65:cc:
+                    48:a8:5e:69:0e:0f:8a:42:48:7a:e7:28:14:13:90:
+                    09:de:e2:a4:fa:0f:9c:a8:8a:0b:e4:fc:15:d9:ed:
+                    69:a7:44:ce:88:7a:d9:c3:99:bb:6d:82:73:d5:94:
+                    aa:a1:45:4e:6b:75:91:f8:47:0f:98:b4:83:0b:ea:
+                    16:7d:56:6c:37:23:73:af:a3:fa:36:c1:2b:4a:15:
+                    c2:2e:05:ee:08:bc:2d:68:84:c6:20:b9:e3:f6:bd:
+                    b1:e1:69:bf:ad:4f:d2:7a:06:75:c2:3e:12:5d:98:
+                    be:0b:e9:42:98:71:ae:88:b0:ed:f6:fa:62:f1:21:
+                    34:f4:35:e1:e2:d0:ef:75:d0:6f:03:cf:a0:a0:6b:
+                    36:13:b5:bb:85:db:be:3d:e2:af:32:e6:19:17:b5:
+                    bb:8f:9b:15:99:be:bd:6f:b5:d9:ca:61:7d:da:72:
+                    87:07
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Basic Constraints: 
                 CA:FALSE
             X509v3 Subject Key Identifier: 
-                8C:D4:48:01:1B:FF:9F:42:0D:81:D2:05:2D:47:CA:8E:F4:DB:18:07
+                4F:2E:22:FC:84:2A:2D:A1:8B:1E:1E:3B:23:7F:37:5B:15:C8:EF:FB
             X509v3 Authority Key Identifier: 
-                keyid:81:6E:C0:15:41:40:77:0F:0C:3A:1E:8B:EF:A5:B4:23:34:2A:D4:0F
+                keyid:25:8F:53:4A:AF:19:8D:4C:F9:45:54:A5:B8:EC:21:1C:C4:63:CB:A2
 
             X509v3 Key Usage: 
                 Digital Signature, Non Repudiation, Key Encipherment
@@ -46,33 +46,33 @@ Certificate:
             X509v3 Subject Alternative Name: 
                 DNS:web-platform.test, DNS:op8.web-platform.test, DNS:op7.web-platform.test, DNS:op9.web-platform.test, DNS:op4.web-platform.test, DNS:not-web-platform.test, DNS:op6.web-platform.test, DNS:op3.web-platform.test, DNS:op2.web-platform.test, DNS:op1.web-platform.test, DNS:www.web-platform.test, DNS:op5.web-platform.test, DNS:op88.web-platform.test, DNS:op98.web-platform.test, DNS:op85.web-platform.test, DNS:op89.web-platform.test, DNS:op66.web-platform.test, DNS:op72.web-platform.test, DNS:op24.web-platform.test, DNS:op41.web-platform.test, DNS:op79.web-platform.test, DNS:op91.web-platform.test, DNS:op59.web-platform.test, DNS:op39.web-platform.test, DNS:op60.web-platform.test, DNS:op58.web-platform.test, DNS:op28.web-platform.test, DNS:www1.web-platform.test, DNS:op14.web-platform.test, DNS:op69.web-platform.test, DNS:op40.web-platform.test, DNS:op74.web-platform.test, DNS:op31.web-platform.test, DNS:op18.web-platform.test, DNS:op73.web-platform.test, DNS:op77.web-platform.test, DNS:op12.web-platform.test, DNS:op54.web-platform.test, DNS:op63.web-platform.test, DNS:op71.web-platform.test, DNS:op95.web-platform.test, DNS:op16.web-platform.test, DNS:op36.web-platform.test, DNS:op27.web-platform.test, DNS:op29.web-platform.test, DNS:op94.web-platform.test, DNS:op44.web-platform.test, DNS:op33.web-platform.test, DNS:op84.web-platform.test, DNS:op32.web-platform.test, DNS:op61.web-platform.test, DNS:op70.web-platform.test, DNS:www2.web-platform.test, DNS:op43.web-platform.test, DNS:op78.web-platform.test, DNS:op26.web-platform.test, DNS:op76.web-platform.test, DNS:op52.web-platform.test, DNS:op99.web-platform.test, DNS:op86.web-platform.test, DNS:op46.web-platform.test, DNS:op17.web-platform.test, DNS:op90.web-platform.test, DNS:op93.web-platform.test, DNS:op10.web-platform.test, DNS:op55.web-platform.test, DNS:op47.web-platform.test, DNS:op51.web-platform.test, DNS:op45.web-platform.test, DNS:op80.web-platform.test, DNS:op68.web-platform.test, DNS:op49.web-platform.test, DNS:op57.web-platform.test, DNS:op35.web-platform.test, DNS:op67.web-platform.test, DNS:op92.web-platform.test, DNS:op15.web-platform.test, DNS:op13.web-platform.test, DNS:op75.web-platform.test, DNS:op64.web-platform.test, DNS:op97.web-platform.test, DNS:op37.web-platform.test, DNS:op56.web-platform.test, DNS:op62.web-platform.test, DNS:op82.web-platform.test, DNS:op25.web-platform.test, DNS:op11.web-platform.test, DNS:op50.web-platform.test, DNS:op38.web-platform.test, DNS:op83.web-platform.test, DNS:op81.web-platform.test, DNS:op20.web-platform.test, DNS:op21.web-platform.test, DNS:op23.web-platform.test, DNS:op42.web-platform.test, DNS:op22.web-platform.test, DNS:op65.web-platform.test, DNS:op96.web-platform.test, DNS:op87.web-platform.test, DNS:op19.web-platform.test, DNS:op53.web-platform.test, DNS:op30.web-platform.test, DNS:op48.web-platform.test, DNS:op34.web-platform.test, DNS:op6.not-web-platform.test, DNS:op3.not-web-platform.test, DNS:op2.not-web-platform.test, DNS:op5.not-web-platform.test, DNS:www.not-web-platform.test, DNS:www.www.web-platform.test, DNS:op7.not-web-platform.test, DNS:op4.not-web-platform.test, DNS:op8.not-web-platform.test, DNS:op9.not-web-platform.test, DNS:op1.not-web-platform.test, DNS:op36.not-web-platform.test, DNS:op53.not-web-platform.test, DNS:op50.not-web-platform.test, DNS:op24.not-web-platform.test, DNS:op31.not-web-platform.test, DNS:op95.not-web-platform.test, DNS:op83.not-web-platform.test, DNS:www2.not-web-platform.test, DNS:op73.not-web-platform.test, DNS:op19.not-web-platform.test, DNS:op21.not-web-platform.test, DNS:op81.not-web-platform.test, DNS:op70.not-web-platform.test, DNS:op78.not-web-platform.test, DNS:op40.not-web-platform.test, DNS:op25.not-web-platform.test, DNS:op65.not-web-platform.test, DNS:www.www2.web-platform.test, DNS:op80.not-web-platform.test, DNS:op52.not-web-platform.test, DNS:op68.not-web-platform.test, DNS:op45.not-web-platform.test, DNS:op71.not-web-platform.test, DNS:op72.not-web-platform.test, DNS:op90.not-web-platform.test, DNS:op89.not-web-platform.test, DNS:op49.not-web-platform.test, DNS:op77.not-web-platform.test, DNS:op79.not-web-platform.test, DNS:op82.not-web-platform.test, DNS:www.www1.web-platform.test, DNS:op12.not-web-platform.test, DNS:op39.not-web-platform.test, DNS:op44.not-web-platform.test, DNS:www1.not-web-platform.test, DNS:op58.not-web-platform.test, DNS:op14.not-web-platform.test, DNS:op30.not-web-platform.test, DNS:op62.not-web-platform.test, DNS:op61.not-web-platform.test, DNS:op92.not-web-platform.test, DNS:op29.not-web-platform.test, DNS:op98.not-web-platform.test, DNS:op64.not-web-platform.test, DNS:op26.not-web-platform.test, DNS:op22.not-web-platform.test, DNS:op94.not-web-platform.test, DNS:op38.not-web-platform.test, DNS:op33.not-web-platform.test, DNS:op23.not-web-platform.test, DNS:op57.not-web-platform.test, DNS:op54.not-web-platform.test, DNS:op85.not-web-platform.test, DNS:op46.not-web-platform.test, DNS:op97.not-web-platform.test, DNS:op32.not-web-platform.test, DNS:op60.not-web-platform.test, DNS:op96.not-web-platform.test, DNS:op51.not-web-platform.test, DNS:op41.not-web-platform.test, DNS:op35.not-web-platform.test, DNS:op99.not-web-platform.test, DNS:op42.not-web-platform.test, DNS:op67.not-web-platform.test, DNS:op37.not-web-platform.test, DNS:op48.not-web-platform.test, DNS:op55.not-web-platform.test, DNS:op56.not-web-platform.test, DNS:op84.not-web-platform.test, DNS:op34.not-web-platform.test, DNS:op69.not-web-platform.test, DNS:op11.not-web-platform.test, DNS:op93.not-web-platform.test, DNS:www1.www.web-platform.test, DNS:op86.not-web-platform.test, DNS:op13.not-web-platform.test, DNS:op20.not-web-platform.test, DNS:op76.not-web-platform.test, DNS:op27.not-web-platform.test, DNS:op17.not-web-platform.test, DNS:op75.not-web-platform.test, DNS:op15.not-web-platform.test, DNS:op47.not-web-platform.test, DNS:op18.not-web-platform.test, DNS:op63.not-web-platform.test, DNS:op28.not-web-platform.test, DNS:op43.not-web-platform.test, DNS:op66.not-web-platform.test, DNS:www2.www.web-platform.test, DNS:op91.not-web-platform.test, DNS:op74.not-web-platform.test, DNS:op59.not-web-platform.test, DNS:op88.not-web-platform.test, DNS:op87.not-web-platform.test, DNS:op10.not-web-platform.test, DNS:op16.not-web-platform.test, DNS:www1.www2.web-platform.test, DNS:www2.www2.web-platform.test, DNS:www2.www1.web-platform.test, DNS:www1.www1.web-platform.test, DNS:www.www.not-web-platform.test, DNS:xn--lve-6lad.web-platform.test, DNS:www1.www.not-web-platform.test, DNS:www.www2.not-web-platform.test, DNS:www2.www.not-web-platform.test, DNS:www.www1.not-web-platform.test, DNS:www2.www2.not-web-platform.test, DNS:www2.www1.not-web-platform.test, DNS:www1.www1.not-web-platform.test, DNS:www1.www2.not-web-platform.test, DNS:xn--lve-6lad.www.web-platform.test, DNS:xn--lve-6lad.not-web-platform.test, DNS:www.xn--lve-6lad.web-platform.test, DNS:www2.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www2.web-platform.test, DNS:xn--lve-6lad.www1.web-platform.test, DNS:www1.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.www.not-web-platform.test, DNS:www.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.www1.not-web-platform.test, DNS:www2.xn--lve-6lad.not-web-platform.test, DNS:www1.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.www2.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--lve-6lad.web-platform.test, DNS:www.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www.web-platform.test, DNS:www1.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www2.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www1.web-platform.test, DNS:www2.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--lve-6lad.xn--lve-6lad.not-web-platform.test, DNS:www.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www2.not-web-platform.test, DNS:www1.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:www2.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.www1.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.web-platform.test, DNS:xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.not-web-platform.test, DNS:xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.web-platform.test, DNS:xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test
     Signature Algorithm: sha256WithRSAEncryption
-         79:cb:a1:17:14:f9:34:8b:f5:ef:cb:21:22:47:dc:b1:32:17:
-         0f:14:d3:d7:03:76:df:41:20:84:50:63:a2:7c:b7:31:fe:a0:
-         f2:c9:30:79:2c:30:6b:f7:eb:36:13:ac:27:5e:4a:06:49:6c:
-         c2:9c:f6:b0:56:a9:6e:25:e2:82:91:e9:ac:3b:2d:9f:cd:a4:
-         f9:c1:74:4c:15:b7:68:ef:01:6f:e0:f2:9b:be:0c:48:96:3f:
-         6e:42:71:e9:f7:d8:08:ba:3d:e6:ab:c0:cf:44:c0:a8:ca:62:
-         84:1c:c2:46:02:b0:77:98:15:ba:7d:60:b9:e5:e9:ff:d9:78:
-         62:cd:5b:0a:8e:25:fe:a3:25:10:83:4e:84:74:25:61:54:33:
-         45:d4:84:cb:76:91:bb:ab:41:d5:98:b1:44:91:4b:e2:d2:a5:
-         75:15:fb:5f:d7:73:6d:6d:c6:4b:97:74:3b:0b:f3:f1:fa:da:
-         19:6d:6b:27:7c:8d:f1:99:86:f1:11:b1:81:2f:a0:2c:fb:fe:
-         9d:67:d2:49:5d:f5:0d:db:03:26:fc:c1:4b:ab:dd:18:d5:7e:
-         7a:64:61:69:3b:90:4f:2d:ad:21:40:07:d1:5a:f0:30:6a:ed:
-         0c:84:58:a1:55:3c:00:e1:23:3e:60:cb:d4:57:1a:69:2d:2e:
-         56:3a:51:14
+         ad:77:d8:df:b7:6b:c2:af:07:58:75:0b:2b:78:15:09:a8:9a:
+         fc:4e:4e:13:64:c2:1b:f9:24:e7:6e:55:4b:3e:23:90:00:d4:
+         05:71:19:96:56:0a:2f:d5:46:2a:6a:94:2c:20:51:7a:99:ad:
+         e8:51:2b:48:ff:5a:56:92:69:04:e9:a7:b7:17:42:43:a3:cc:
+         af:2a:8d:1a:a7:52:6f:82:42:a8:d4:ea:3a:85:f4:47:c9:bd:
+         27:16:b0:9d:2c:13:99:19:37:45:24:f9:b1:7a:52:75:d1:a5:
+         a2:7c:1f:4a:d8:a1:7e:65:5f:7e:53:e7:b1:bf:31:6c:1c:98:
+         eb:09:7a:cd:b3:cf:4a:ae:f6:1a:1f:43:4b:22:d6:b2:11:96:
+         e0:08:aa:96:39:da:b8:4f:1c:e5:32:15:31:d5:dc:78:74:e0:
+         d1:2c:cb:f1:93:01:32:a4:d9:d8:69:9c:a1:8c:94:4f:cd:d0:
+         86:e0:1c:76:02:0e:bf:dc:b2:53:67:7c:3f:82:d2:87:8f:11:
+         ce:26:85:38:1b:f3:65:62:fb:36:9c:e3:c4:57:68:f2:4d:00:
+         23:21:69:54:47:2a:77:e6:ac:37:d0:b4:a9:48:bf:fb:e0:03:
+         08:65:31:72:1e:7e:8f:fb:e2:39:99:a5:87:6f:4e:46:46:0a:
+         53:38:ec:d4
 -----BEGIN CERTIFICATE-----
-MIIgvDCCH6SgAwIBAgIDDeugMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
-Yi1wbGF0Zm9ybS10ZXN0czAeFw0yMDEwMTIwMDMwNDdaFw0yMTEwMTIwMDMwNDda
+MIIgvDCCH6SgAwIBAgIDC40WMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNVBAMMEndl
+Yi1wbGF0Zm9ybS10ZXN0czAeFw0yMDExMTIwMDIwNTNaFw0yMTExMTIwMDIwNTNa
 MBwxGjAYBgNVBAMMEXdlYi1wbGF0Zm9ybS50ZXN0MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAq7vL9B+SmtjTxllVeWNIfREf/cpwiy0psv4x43L2LcDa
-QH0oB7ptQm1s3vchO2zWkPRV2wN91d3J4dIM1MjivNcsXFOVZCqcjSXGBQf6YzjA
-euq0tkA0djxKyU3bodct7F+iWytWgEPGnEpxVzM9i9vLMJl4JhWJgsVhwfMVbD0e
-caiGr+XJ40MlX4uwZXGQlGoxMb7oJBLY7XJEmcwSpsi2FiI1XBCMFGmqRMrbNZhC
-S9qkB0aBB1bJKMNdlbjzmpyIaQXJqwyEZaZ04Wbh2Tv2jnilhvbChVXwjkQFK7vt
-/7nV0WwS0C5qQWYljvBdRLizalIbFsf2xbJ/et9BDwIDAQABo4IeBDCCHgAwCQYD
-VR0TBAIwADAdBgNVHQ4EFgQUjNRIARv/n0INgdIFLUfKjvTbGAcwHwYDVR0jBBgw
-FoAUgW7AFUFAdw8MOh6L76W0IzQq1A8wCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoG
+AAOCAQ8AMIIBCgKCAQEAyec51tTormlc0gahrCBjY4sW42Dt6Un/98bFu1fR3PUG
+SeET+UbdVPJ/t/7xcB+pLOVn3aNr1q0bAcfGdO5fm/RSRd+YtJACfST4QFmsYN2o
+I9AI/6WHZcxIqF5pDg+KQkh65ygUE5AJ3uKk+g+cqIoL5PwV2e1pp0TOiHrZw5m7
+bYJz1ZSqoUVOa3WR+EcPmLSDC+oWfVZsNyNzr6P6NsErShXCLgXuCLwtaITGILnj
+9r2x4Wm/rU/SegZ1wj4SXZi+C+lCmHGuiLDt9vpi8SE09DXh4tDvddBvA8+goGs2
+E7W7hdu+PeKvMuYZF7W7j5sVmb69b7XZymF92nKHBwIDAQABo4IeBDCCHgAwCQYD
+VR0TBAIwADAdBgNVHQ4EFgQUTy4i/IQqLaGLHh47I383WxXI7/swHwYDVR0jBBgw
+FoAUJY9TSq8ZjUz5RVSluOwhHMRjy6IwCwYDVR0PBAQDAgXgMBMGA1UdJQQMMAoG
 CCsGAQUFBwMBMIIdjwYDVR0RBIIdhjCCHYKCEXdlYi1wbGF0Zm9ybS50ZXN0ghVv
 cDgud2ViLXBsYXRmb3JtLnRlc3SCFW9wNy53ZWItcGxhdGZvcm0udGVzdIIVb3A5
 LndlYi1wbGF0Zm9ybS50ZXN0ghVvcDQud2ViLXBsYXRmb3JtLnRlc3SCFW5vdC13
@@ -231,10 +231,10 @@ NmxhZC54bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRl
 c3SCQXhuLS1uOGo2ZHM1M2x3d2tycWh2MjhhLnhuLS1uOGo2ZHM1M2x3d2tycWh2
 MjhhLndlYi1wbGF0Zm9ybS50ZXN0gkV4bi0tbjhqNmRzNTNsd3drcnFodjI4YS54
 bi0tbjhqNmRzNTNsd3drcnFodjI4YS5ub3Qtd2ViLXBsYXRmb3JtLnRlc3QwDQYJ
-KoZIhvcNAQELBQADggEBAHnLoRcU+TSL9e/LISJH3LEyFw8U09cDdt9BIIRQY6J8
-tzH+oPLJMHksMGv36zYTrCdeSgZJbMKc9rBWqW4l4oKR6aw7LZ/NpPnBdEwVt2jv
-AW/g8pu+DEiWP25Ccen32Ai6PearwM9EwKjKYoQcwkYCsHeYFbp9YLnl6f/ZeGLN
-WwqOJf6jJRCDToR0JWFUM0XUhMt2kburQdWYsUSRS+LSpXUV+1/Xc21txkuXdDsL
-8/H62hltayd8jfGZhvERsYEvoCz7/p1n0kld9Q3bAyb8wUur3RjVfnpkYWk7kE8t
-rSFAB9Fa8DBq7QyEWKFVPADhIz5gy9RXGmktLlY6URQ=
+KoZIhvcNAQELBQADggEBAK132N+3a8KvB1h1Cyt4FQmomvxOThNkwhv5JOduVUs+
+I5AA1AVxGZZWCi/VRipqlCwgUXqZrehRK0j/WlaSaQTpp7cXQkOjzK8qjRqnUm+C
+QqjU6jqF9EfJvScWsJ0sE5kZN0Uk+bF6UnXRpaJ8H0rYoX5lX35T57G/MWwcmOsJ
+es2zz0qu9hofQ0si1rIRluAIqpY52rhPHOUyFTHV3Hh04NEsy/GTATKk2dhpnKGM
+lE/N0IbgHHYCDr/cslNnfD+C0oePEc4mhTgb82Vi+zac48RXaPJNACMhaVRHKnfm
+rDfQtKlIv/vgAwhlMXIefo/74jmZpYdvTkZGClM47NQ=
 -----END CERTIFICATE-----
diff --git a/tests/wpt/web-platform-tests/tools/gitignore/gitignore.py b/tests/wpt/web-platform-tests/tools/gitignore/gitignore.py
index 2a276151866..dbe83c27eee 100644
--- a/tests/wpt/web-platform-tests/tools/gitignore/gitignore.py
+++ b/tests/wpt/web-platform-tests/tools/gitignore/gitignore.py
@@ -155,7 +155,10 @@ class PathFilter(object):
         self.literals_dir = defaultdict(dict)  # type: Dict[Optional[bytes], Dict[bytes, List[Tuple[bool, Pattern[bytes]]]]]
         self.patterns_file = []  # type: List[Tuple[Tuple[bool, Pattern[bytes]], List[Tuple[bool, Pattern[bytes]]]]]
         self.patterns_dir = []  # type: List[Tuple[Tuple[bool, Pattern[bytes]], List[Tuple[bool, Pattern[bytes]]]]]
-        self.cache = cache or {}  # type: MutableMapping[bytes, bool]
+
+        if cache is None:
+            cache = {}
+        self.cache = cache  # type: MutableMapping[bytes, bool]
 
         if extras is None:
             extras = []
@@ -246,7 +249,7 @@ class PathFilter(object):
                         if not self.cache[path]:
                             target.append(item)
                         continue
-                    for rule_dir in [None, dirpath]:
+                    for rule_dir in [None, dirpath if dirpath != b"." else b""]:
                         if name in literals.get(rule_dir, empty):
                             exclude = literals[rule_dir][name]
                             if not any(rule.match(name if name_only else path)
diff --git a/tests/wpt/web-platform-tests/tools/manifest/jsonlib.py b/tests/wpt/web-platform-tests/tools/manifest/jsonlib.py
new file mode 100644
index 00000000000..e7f07c3ad2a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/manifest/jsonlib.py
@@ -0,0 +1,144 @@
+import re
+import json
+
+from six import PY3
+
+
+MYPY = False
+if MYPY:
+    # MYPY is set to True when run under Mypy.
+    from typing import Any, AnyStr, Callable, Dict, IO, Text
+
+
+__all__ = ["load", "dump_local", "dump_local", "dump_dist", "dumps_dist"]
+
+
+try:
+    import ujson
+except ImportError:
+    has_ujson = False
+else:
+    has_ujson = True
+
+#
+# load
+#
+
+if has_ujson:
+    load = ujson.load  # type: Callable[[IO[AnyStr]], Any]
+
+else:
+    load = json.load
+
+
+#
+# loads
+#
+
+if has_ujson:
+    loads = ujson.loads  # type: Callable[[AnyStr], Any]
+
+else:
+    loads = json.loads
+
+
+#
+# dump/dumps_local options for some libraries
+#
+_ujson_dump_local_kwargs = {
+    'ensure_ascii': False,
+    'escape_forward_slashes': False,
+    'indent': 1,
+}  # type: Dict[str, Any]
+
+if PY3:
+    _ujson_dump_local_kwargs['reject_bytes'] = True
+
+
+_json_dump_local_kwargs = {
+    'ensure_ascii': False,
+    'indent': 1,
+    'separators': (',', ': '),
+}  # type: Dict[str, Any]
+
+
+#
+# dump_local (for local, non-distributed usage of JSON)
+#
+
+if has_ujson:
+    def dump_local(obj, fp):
+        # type: (Any, IO[str]) -> None
+        return ujson.dump(obj, fp, **_ujson_dump_local_kwargs)
+
+else:
+    def dump_local(obj, fp):
+        # type: (Any, IO[str]) -> None
+        return json.dump(obj, fp, **_json_dump_local_kwargs)
+
+
+#
+# dumps_local (for local, non-distributed usage of JSON)
+#
+
+if has_ujson:
+    def dumps_local(obj):
+        # type: (Any) -> Text
+        return ujson.dumps(obj, **_ujson_dump_local_kwargs)
+
+else:
+    def dumps_local(obj):
+        # type: (Any) -> Text
+        return json.dumps(obj, **_json_dump_local_kwargs)
+
+
+#
+# dump/dumps_dist (for distributed usage of JSON where files should safely roundtrip)
+#
+
+_ujson_dump_dist_kwargs = {
+    'sort_keys': True,
+    'indent': 1,
+}  # type: Dict[str, Any]
+
+if PY3:
+    _ujson_dump_dist_kwargs['reject_bytes'] = True
+
+_json_dump_dist_kwargs = {
+    'sort_keys': True,
+    'indent': 1,
+    'separators': (',', ': '),
+}  # type: Dict[str, Any]
+
+
+if has_ujson:
+    if ujson.dumps([], indent=1) == "[]":
+        # optimistically see if https://github.com/ultrajson/ultrajson/issues/429 is fixed
+        def _ujson_fixup(s):
+            # type: (str) -> str
+            return s
+    else:
+        _ujson_fixup_re = re.compile(r"([\[{])[\n\x20]+([}\]])")
+
+        def _ujson_fixup(s):
+            # type: (str) -> str
+            return _ujson_fixup_re.sub(
+                lambda m: m.group(1) + m.group(2),
+                s
+            )
+
+    def dump_dist(obj, fp):
+        # type: (Any, IO[str]) -> None
+        fp.write(_ujson_fixup(ujson.dumps(obj, **_ujson_dump_dist_kwargs)))
+
+    def dumps_dist(obj):
+        # type: (Any) -> Text
+        return _ujson_fixup(ujson.dumps(obj, **_ujson_dump_dist_kwargs))
+else:
+    def dump_dist(obj, fp):
+        # type: (Any, IO[str]) -> None
+        json.dump(obj, fp, **_json_dump_dist_kwargs)
+
+    def dumps_dist(obj):
+        # type: (Any) -> Text
+        return json.dumps(obj, **_json_dump_dist_kwargs)
diff --git a/tests/wpt/web-platform-tests/tools/manifest/manifest.py b/tests/wpt/web-platform-tests/tools/manifest/manifest.py
index 449cd245acb..14d3844d461 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/manifest.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/manifest.py
@@ -1,6 +1,5 @@
 import io
 import itertools
-import json
 import os
 from atomicwrites import atomic_write
 from copy import deepcopy
@@ -13,6 +12,7 @@ from six import (
     string_types,
 )
 
+from . import jsonlib
 from . import vcs
 from .item import (ConformanceCheckerTest,
                    CrashTest,
@@ -45,11 +45,6 @@ if MYPY:
     from typing import Type
     from typing import Union
 
-try:
-    import ujson
-    fast_json = ujson
-except ImportError:
-    fast_json = json  # type: ignore
 
 CURRENT_VERSION = 8  # type: int
 
@@ -354,7 +349,7 @@ def _load(logger,  # type: Logger
         try:
             with io.open(manifest, "r", encoding="utf-8") as f:
                 rv = Manifest.from_json(tests_root,
-                                        fast_json.load(f),
+                                        jsonlib.load(f),
                                         types=types,
                                         callee_owns_obj=True)
         except IOError:
@@ -364,7 +359,7 @@ def _load(logger,  # type: Logger
             return None
     else:
         rv = Manifest.from_json(tests_root,
-                                fast_json.load(manifest),
+                                jsonlib.load(manifest),
                                 types=types,
                                 callee_owns_obj=True)
 
@@ -476,6 +471,5 @@ def write(manifest, manifest_path):
     with atomic_write(manifest_path, overwrite=True) as f:
         # Use ',' instead of the default ', ' separator to prevent trailing
         # spaces: https://docs.python.org/2/library/json.html#json.dump
-        json.dump(manifest.to_json(caller_owns_obj=True), f,
-                  sort_keys=True, indent=1, separators=(',', ': '))
+        jsonlib.dump_dist(manifest.to_json(caller_owns_obj=True), f)
         f.write("\n")
diff --git a/tests/wpt/web-platform-tests/tools/manifest/vcs.py b/tests/wpt/web-platform-tests/tools/manifest/vcs.py
index 344575276b4..4f3bfdaf124 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/vcs.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/vcs.py
@@ -1,5 +1,4 @@
 import abc
-import json
 import os
 import stat
 from collections import deque
@@ -7,6 +6,7 @@ from collections import deque
 from six import with_metaclass, PY2
 from six.moves.collections_abc import MutableMapping
 
+from . import jsonlib
 from .utils import git
 
 # Cannot do `from ..gitignore import gitignore` because
@@ -24,6 +24,10 @@ if MYPY:
     else:
         stat_result = os.stat_result
 
+    GitIgnoreCacheType = MutableMapping[bytes, bool]
+else:
+    GitIgnoreCacheType = MutableMapping
+
 
 def get_tree(tests_root, manifest, manifest_path, cache_root,
              working_copy=True, rebuild=False):
@@ -148,7 +152,7 @@ class CacheFile(with_metaclass(abc.ABCMeta)):
         if not self.modified:
             return
         with open(self.path, 'w') as f:
-            json.dump(self.data, f, indent=1)
+            jsonlib.dump_local(self.data, f)
 
     def load(self, rebuild=False):
         # type: (bool) -> Dict[Text, Any]
@@ -157,7 +161,7 @@ class CacheFile(with_metaclass(abc.ABCMeta)):
             if not rebuild:
                 with open(self.path, 'r') as f:
                     try:
-                        data = json.load(f)
+                        data = jsonlib.load(f)
                     except ValueError:
                         pass
                 data = self.check_valid(data)
@@ -220,8 +224,8 @@ class MtimeCache(CacheFile):
         super(MtimeCache, self).dump()
 
 
-class GitIgnoreCache(CacheFile, MutableMapping):  # type: ignore
-    file_name = "gitignore.json"
+class GitIgnoreCache(CacheFile, GitIgnoreCacheType):
+    file_name = "gitignore2.json"
 
     def check_valid(self, data):
         # type: (Dict[Any, Any]) -> Dict[Any, Any]
@@ -235,27 +239,35 @@ class GitIgnoreCache(CacheFile, MutableMapping):  # type: ignore
 
     def __contains__(self, key):
         # type: (Any) -> bool
+        try:
+            key = key.decode("utf-8")
+        except Exception:
+            return False
+
         return key in self.data
 
     def __getitem__(self, key):
-        # type: (Text) -> bool
-        v = self.data[key]
+        # type: (bytes) -> bool
+        real_key = key.decode("utf-8")
+        v = self.data[real_key]
         assert isinstance(v, bool)
         return v
 
     def __setitem__(self, key, value):
-        # type: (Text, bool) -> None
-        if self.data.get(key) != value:
+        # type: (bytes, bool) -> None
+        real_key = key.decode("utf-8")
+        if self.data.get(real_key) != value:
             self.modified = True
-            self.data[key] = value
+            self.data[real_key] = value
 
     def __delitem__(self, key):
-        # type: (Text) -> None
-        del self.data[key]
+        # type: (bytes) -> None
+        real_key = key.decode("utf-8")
+        del self.data[real_key]
 
     def __iter__(self):
-        # type: () -> Iterator[Text]
-        return iter(self.data)
+        # type: () -> Iterator[bytes]
+        return (key.encode("utf-8") for key in self.data)
 
     def __len__(self):
         # type: () -> int
diff --git a/tests/wpt/web-platform-tests/tools/mypy.ini b/tests/wpt/web-platform-tests/tools/mypy.ini
index b943b6d089a..4d352302d80 100644
--- a/tests/wpt/web-platform-tests/tools/mypy.ini
+++ b/tests/wpt/web-platform-tests/tools/mypy.ini
@@ -22,6 +22,9 @@ ignore_missing_imports = True
 [mypy-pytest.*]
 ignore_missing_imports = True
 
+[mypy-ujson.*]
+ignore_missing_imports = True
+
 [mypy-zstandard.*]
 ignore_missing_imports = True
 
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
index f4e3c763795..73fec5a8925 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
@@ -116,14 +116,49 @@ class ActionSequence(object):
     def _key_action(self, subtype, value):
         self._actions.append({"type": subtype, "value": value})
 
-    def _pointer_action(self, subtype, button):
-        self._actions.append({"type": subtype, "button": button})
+    def _pointer_action(self, subtype, button=None, x=None, y=None, duration=None, origin=None, width=None,
+                        height=None, pressure=None, tangential_pressure=None, tilt_x=None,
+                        tilt_y=None, twist=None, altitude_angle=None, azimuth_angle=None):
+        action = {
+            "type": subtype
+        }
+        if button is not None:
+            action["button"] = button
+        if x is not None:
+            action["x"] = x
+        if y is not None:
+            action["y"] = y
+        if duration is not None:
+            action["duration"] = duration
+        if origin is not None:
+            action["origin"] = origin
+        if width is not None:
+            action["width"] = width
+        if height is not None:
+            action["height"] = height
+        if pressure is not None:
+            action["pressure"] = pressure
+        if tangential_pressure is not None:
+            action["tangentialPressure"] = tangential_pressure
+        if tilt_x is not None:
+            action["tiltX"] = tilt_x
+        if tilt_y is not None:
+            action["tiltY"] = tilt_y
+        if twist is not None:
+            action["twist"] = twist
+        if altitude_angle is not None:
+            action["altitudeAngle"] = altitude_angle
+        if azimuth_angle is not None:
+            action["azimuthAngle"] = azimuth_angle
+        self._actions.append(action)
 
     def pause(self, duration):
         self._actions.append({"type": "pause", "duration": duration})
         return self
 
-    def pointer_move(self, x, y, duration=None, origin=None):
+    def pointer_move(self, x, y, duration=None, origin=None, width=None, height=None,
+                     pressure=None, tangential_pressure=None, tilt_x=None, tilt_y=None,
+                     twist=None, altitude_angle=None, azimuth_angle=None):
         """Queue a pointerMove action.
 
         :param x: Destination x-axis coordinate of pointer in CSS pixels.
@@ -133,16 +168,10 @@ class ActionSequence(object):
         :param origin: Origin of coordinates, either "viewport", "pointer" or
                        an Element. If None, remote end defaults to "viewport".
         """
-        action = {
-            "type": "pointerMove",
-            "x": x,
-            "y": y
-        }
-        if duration is not None:
-            action["duration"] = duration
-        if origin is not None:
-            action["origin"] = origin
-        self._actions.append(action)
+        self._pointer_action("pointerMove", x=x, y=y, duration=duration, origin=origin,
+                             width=width, height=height, pressure=pressure,
+                             tangential_pressure=tangential_pressure, tilt_x=tilt_x, tilt_y=tilt_y,
+                             twist=twist, altitude_angle=altitude_angle, azimuth_angle=azimuth_angle)
         return self
 
     def pointer_up(self, button=0):
@@ -151,16 +180,21 @@ class ActionSequence(object):
         :param button: Pointer button to perform action with.
                        Default: 0, which represents main device button.
         """
-        self._pointer_action("pointerUp", button)
+        self._pointer_action("pointerUp", button=button)
         return self
 
-    def pointer_down(self, button=0):
+    def pointer_down(self, button=0, width=None, height=None, pressure=None,
+                     tangential_pressure=None, tilt_x=None, tilt_y=None,
+                     twist=None, altitude_angle=None, azimuth_angle=None):
         """Queue a pointerDown action for `button`.
 
         :param button: Pointer button to perform action with.
                        Default: 0, which represents main device button.
         """
-        self._pointer_action("pointerDown", button)
+        self._pointer_action("pointerDown", button=button, width=width, height=height,
+                             pressure=pressure, tangential_pressure=tangential_pressure,
+                             tilt_x=tilt_x, tilt_y=tilt_y, twist=twist, altitude_angle=altitude_angle,
+                             azimuth_angle=azimuth_angle)
         return self
 
     def click(self, element=None, button=0):
diff --git a/tests/wpt/web-platform-tests/tools/wpt/browser.py b/tests/wpt/web-platform-tests/tools/wpt/browser.py
index 86bb19b5993..800080e91e6 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/browser.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/browser.py
@@ -646,10 +646,10 @@ class Chrome(Browser):
             # No Canary on Linux.
             return find_executable(name)
         if uname[0] == "Darwin":
-            if channel == "canary":
-                return "/Applications/Google Chrome Canary.app/Contents/MacOS/Google Chrome Canary"
-            # All other channels share the same path on macOS.
-            return "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
+            suffix = ""
+            if channel in ("beta", "dev", "canary"):
+                suffix = " " + channel.capitalize()
+            return "/Applications/Google Chrome%s.app/Contents/MacOS/Google Chrome%s" % (suffix, suffix)
         if uname[0] == "Windows":
             path = os.path.expandvars(r"$SYSTEMDRIVE\Program Files (x86)\Google\Chrome\Application\chrome.exe")
             if not os.path.exists(path):
diff --git a/tests/wpt/web-platform-tests/tools/wpt/wpt.py b/tests/wpt/web-platform-tests/tools/wpt/wpt.py
index efa985c7cc1..9bc6ce6ce9e 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/wpt.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/wpt.py
@@ -50,7 +50,10 @@ def parse_args(argv, commands=load_commands()):
                         dest="skip_venv_setup",
                         help="Whether to use the virtualenv as-is. Must set --venv as well")
     parser.add_argument("--debug", action="store_true", help="Run the debugger in case of an exception")
-    parser.add_argument("--py3", action="store_true", help="Run with python3")
+    parser.add_argument("--py3", action="store_true",
+                        help="Run with Python 3 (requires a `python3` binary on the PATH)")
+    parser.add_argument("--py2", action="store_true",
+                        help="Run with Python 2 (requires a `python2` binary on the PATH)")
     subparsers = parser.add_subparsers(dest="command")
     for command, props in iteritems(commands):
         subparsers.add_parser(command, help=props["help"], add_help=False)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt
index 4893d7bd628..766b9bd9143 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements.txt
@@ -5,6 +5,6 @@ mozdebug==0.2
 # Pillow 7 requires Python 3
 pillow==6.2.2; python_version <= '2.7'  # pyup: <7.0
 pillow==8.0.1; python_version >= '3.0'
-urllib3[secure]==1.25.11
+urllib3[secure]==1.26.1
 requests==2.24.0
 six==1.15.0
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_android_webview.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_android_webview.txt
index e7e7161b142..874980b338a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_android_webview.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_android_webview.txt
@@ -1 +1 @@
-mozprocess==1.2.0
+mozprocess==1.2.1
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome.txt
index e7e7161b142..874980b338a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome.txt
@@ -1 +1 @@
-mozprocess==1.2.0
+mozprocess==1.2.1
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome_android.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome_android.txt
index e7e7161b142..874980b338a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome_android.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome_android.txt
@@ -1 +1 @@
-mozprocess==1.2.0
+mozprocess==1.2.1
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome_ios.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome_ios.txt
index e7e7161b142..874980b338a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome_ios.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome_ios.txt
@@ -1 +1 @@
-mozprocess==1.2.0
+mozprocess==1.2.1
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge.txt
index 0a61208d77c..0ef64c232bc 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge.txt
@@ -1,2 +1,2 @@
-mozprocess==1.2.0
+mozprocess==1.2.1
 selenium==3.141.0
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge_chromium.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge_chromium.txt
index 3f1ee1f6b20..1c7736b98b1 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge_chromium.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge_chromium.txt
@@ -1 +1 @@
-mozprocess==1.2.0
+mozprocess==1.2.1
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_epiphany.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_epiphany.txt
index e7e7161b142..874980b338a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_epiphany.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_epiphany.txt
@@ -1 +1 @@
-mozprocess==1.2.0
+mozprocess==1.2.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 5585609e5c3..373466dae07 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_firefox.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_firefox.txt
@@ -3,7 +3,7 @@ mozcrash==2.0.0
 mozinstall==2.0.0
 mozleak==0.2
 moznetwork==1.1.0
-mozprocess==1.2.0
+mozprocess==1.2.1
 mozprofile==2.5.0
 mozrunner==8.0.0
 mozversion==2.3.0
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_ie.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_ie.txt
index 0a61208d77c..0ef64c232bc 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_ie.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_ie.txt
@@ -1,2 +1,2 @@
-mozprocess==1.2.0
+mozprocess==1.2.1
 selenium==3.141.0
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_opera.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_opera.txt
index 0a61208d77c..0ef64c232bc 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_opera.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_opera.txt
@@ -1,2 +1,2 @@
-mozprocess==1.2.0
+mozprocess==1.2.1
 selenium==3.141.0
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_safari.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_safari.txt
index e7e7161b142..874980b338a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_safari.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_safari.txt
@@ -1 +1 @@
-mozprocess==1.2.0
+mozprocess==1.2.1
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_sauce.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_sauce.txt
index 34c66ee238b..d363945f54f 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_sauce.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_sauce.txt
@@ -1,3 +1,3 @@
-mozprocess==1.2.0
+mozprocess==1.2.1
 selenium==3.141.0
 requests==2.24.0
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_servo.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_servo.txt
index e7e7161b142..874980b338a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_servo.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_servo.txt
@@ -1 +1 @@
-mozprocess==1.2.0
+mozprocess==1.2.1
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_webkit.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_webkit.txt
index e7e7161b142..874980b338a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_webkit.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_webkit.txt
@@ -1 +1 @@
-mozprocess==1.2.0
+mozprocess==1.2.1
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
index c6e58358188..071d53e9e4e 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_spki_certs.py
@@ -2,7 +2,7 @@
 # DO NOT EDIT MANUALLY.
 
 # tools/certs/web-platform.test.pem
-WPT_FINGERPRINT = 'HaGjcmfWjcURDEnkUEWZ28YAkYo5tM12hxAMQ2Z3750='
+WPT_FINGERPRINT = '2cJlW4Y613RmoaIxvps+Afm0Fd3olxiahT3z2DNw6PA='
 
 # signed-exchange/resources/127.0.0.1.sxg.pem
 SXG_WPT_FINGERPRINT = '0Rt4mT6SJXojEMHTnKnlJ/hBKMBcI4kteBlhR1eTTdk='
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
index 75cebb9f7f1..e95bc93deca 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -268,7 +268,7 @@ class FirefoxInstanceManager(object):
         marionette_port = get_free_port()
         profile.set_preferences({"marionette.port": marionette_port})
 
-        env = test_environment(xrePath=os.path.dirname(self.binary),
+        env = test_environment(xrePath=os.path.abspath(os.path.dirname(self.binary)),
                                debugger=self.debug_info is not None,
                                useLSan=True, log=self.logger)
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/state.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/state.py
index bdb23fed99e..6b6ff1a7e08 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/state.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/state.py
@@ -97,7 +97,7 @@ class SavedState(BaseState):
         try:
             if not os.path.isfile(cls.filename):
                 return None
-            with open(cls.filename) as f:
+            with open(cls.filename, "rb") as f:
                 try:
                     rv = pickle.load(f)
                     logger.debug("Loading data %r" % (rv._data,))
@@ -111,7 +111,7 @@ class SavedState(BaseState):
 
     def save(self):
         """Write the state to disk"""
-        with open(self.filename, "w") as f:
+        with open(self.filename, "wb") as f:
             pickle.dump(self, f)
 
     def clear(self):
diff --git a/tests/wpt/web-platform-tests/trust-tokens/trust-token-parameter-validation-xhr.tentative.https.html b/tests/wpt/web-platform-tests/trust-tokens/trust-token-parameter-validation-xhr.tentative.https.html
index 0ee538c07e6..52d72301be9 100644
--- a/tests/wpt/web-platform-tests/trust-tokens/trust-token-parameter-validation-xhr.tentative.https.html
+++ b/tests/wpt/web-platform-tests/trust-tokens/trust-token-parameter-validation-xhr.tentative.https.html
@@ -71,7 +71,7 @@
       let request = new XMLHttpRequest();
       request.open('GET', 'https://trusttoken.example');
       request.setTrustToken({
-        type: "send-srr",
+        type: "send-redemption-record",
         issuers: []
       });
     });
@@ -82,7 +82,7 @@
       let request = new XMLHttpRequest();
       request.open('GET', 'https://trusttoken.example');
       request.setTrustToken({
-        type: "send-srr",
+        type: "send-redemption-record",
         issuers: [3]
       });
     });
@@ -93,7 +93,7 @@
       let request = new XMLHttpRequest();
       request.open('GET', 'https://trusttoken.example');
       request.setTrustToken({
-        type: "send-srr",
+        type: "send-redemption-record",
         issuers: ["not a valid URL"]
       });
     });
@@ -104,7 +104,7 @@
       let request = new XMLHttpRequest();
       request.open('GET', 'https://trusttoken.example');
       request.setTrustToken({
-        type: "send-srr",
+        type: "send-redemption-record",
         issuers: ["http://not-secure.com"]
       });
     });
@@ -114,7 +114,7 @@
     let request = new XMLHttpRequest();
     request.open('GET', 'https://trusttoken.example');
     request.setTrustToken({
-      type: "send-srr",
+      type: "send-redemption-record",
       issuers: ["http://localhost"]
     });
   }, 'Since localhost URLs are potentially trustworthy, setting an issuer to localhost should succeed.');
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
index 733873e538c..2ed88dd2456 100644
--- 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
@@ -50,7 +50,7 @@
     assert_throws_js(TypeError, () => {
       new Request('https://example.com', {
         trustToken: {
-          type: "send-srr",
+          type: "send-redemption-record",
           issuers: []
         }
       });
@@ -61,7 +61,7 @@
     assert_throws_js(TypeError, () => {
       new Request('https://example.com', {
         trustToken: {
-          type: "send-srr",
+          type: "send-redemption-record",
           issuers: [3]
         }
       });
@@ -72,7 +72,7 @@
     assert_throws_js(TypeError, () => {
       new Request('https://example.com', {
         trustToken: {
-          type: "send-srr",
+          type: "send-redemption-record",
           issuers: ["not a valid URL"]
         }
       });
@@ -83,7 +83,7 @@
     assert_throws_js(TypeError, () => {
       new Request('https://example.com', {
         trustToken: {
-          type: "send-srr",
+          type: "send-redemption-record",
           issuers: ["http://not-secure.com"]
         }
       });
@@ -93,7 +93,7 @@
   test(() => {
     new Request('https://example.com', {
       trustToken: {
-        type: "send-srr",
+        type: "send-redemption-record",
         issuers: ["http://localhost"]
       }
     });
diff --git a/tests/wpt/web-platform-tests/trusted-types/require-trusted-types-for.tentative.html b/tests/wpt/web-platform-tests/trusted-types/require-trusted-types-for.tentative.html
index 2a3820a89b8..bf3dedd978c 100644
--- a/tests/wpt/web-platform-tests/trusted-types/require-trusted-types-for.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/require-trusted-types-for.tentative.html
@@ -75,4 +75,26 @@
       resolve();
     });
   }, "Set require trusted types for 'script' without CSP for trusted types don't block policy creation and using.");
+
+  promise_test(t => {
+    let p = Promise.resolve()
+        .then(promise_violation("require-trusted-types-for 'script'"));
+    let s = new Sanitizer();
+    assert_throws_js(TypeError,
+        _ => {
+          fragment = s.sanitize("testHTML");
+        });
+    return p;
+  }, "Require trusted types for 'script' block Sanitizer sanitize from string API.");
+
+  promise_test(t => {
+    let p = Promise.resolve()
+        .then(promise_violation("require-trusted-types-for 'script'"));
+    let s = new Sanitizer();
+    assert_throws_js(TypeError,
+        _ => {
+          fragment = s.sanitize(null);
+        });
+    return p;
+  }, "Require trusted types for 'script' block Sanitizer sanitize null from string API.");
 </script>
diff --git a/tests/wpt/web-platform-tests/webcodecs/video-encoder.html b/tests/wpt/web-platform-tests/webcodecs/video-encoder.html
index 20b01a93299..1e723d42bf1 100644
--- a/tests/wpt/web-platform-tests/webcodecs/video-encoder.html
+++ b/tests/wpt/web-platform-tests/webcodecs/video-encoder.html
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html>
-<title>Test the VideoTrackReader API.</title>
+<head>
+  <title>Test the VideoTrackReader API.</title>
+</head>
 <body>
   <img id='frame_image' src="pattern.png">
 </body>
@@ -10,204 +12,270 @@
 <script src="/webcodecs/utils.js"></script>
 <script>
 
-const defaultConfig = {
-  codec: 'vp8',
-  framerate: 25,
-  width: 640,
-  height: 480
-};
+  const defaultConfig = {
+    codec: 'vp8',
+    framerate: 25,
+    width: 640,
+    height: 480
+  };
 
-async function generateBitmap(width, height) {
-  return createImageBitmap(document.getElementById('frame_image'),
-                                  { resizeWidth: width,
-                                    resizeHeight: height });
-}
-
-async function createVideoFrame(width, height, timestamp) {
-  let bitmap = await generateBitmap(width, height);
-  return new VideoFrame(bitmap, { timestamp: timestamp });
-}
-
-promise_test(t => {
-  // VideoEncoderInit lacks required fields.
-  assert_throws_js(TypeError, () => { new VideoEncoder({}); });
-
-  // VideoEncoderInit has required fields.
-  let encoder = new VideoEncoder(getDefaultCodecInit(t));
-
-  assert_equals(encoder.state, "unconfigured");
-
-  encoder.close();
-
-  return endAfterEventLoopTurn();
-}, 'Test VideoEncoder construction');
-
-promise_test(t => {
-  let encoder = new VideoEncoder(getDefaultCodecInit(t));
-
-  let badCodecsList = [
-    '',                         // Empty codec
-    'bogus',                    // Non exsitent codec
-    'vorbis',                   // Audio codec
-    'vp9',                      // Ambiguous codec
-    'video/webm; codecs="vp9"'  // Codec with mime type
-  ]
-
-  testConfigurations(encoder, defaultConfig, badCodecsList);
-
-  return endAfterEventLoopTurn();
-}, 'Test VideoEncoder.configure()');
-
-promise_test(async t => {
-  let output_chunks = [];
-  let codecInit = getDefaultCodecInit(t);
-  codecInit.output = chunk => output_chunks.push(chunk);
-
-  let encoder = new VideoEncoder(codecInit);
-
-  // No encodes yet.
-  assert_equals(encoder.encodeQueueSize, 0);
-
-  encoder.configure(defaultConfig);
-
-  // Still no encodes.
-  assert_equals(encoder.encodeQueueSize, 0);
-
-  let frame1 = await createVideoFrame(640, 480, 0);
-  let frame2 = await createVideoFrame(640, 480, 33333);
-
-  encoder.encode(frame1.clone());
-  encoder.encode(frame2.clone());
-
-  // Could be 0, 1, or 2. We can't guarantee this check runs before the UA has
-  // processed the encodes.
-  assert_true(encoder.encodeQueueSize >= 0 && encoder.encodeQueueSize <= 2)
-
-  await encoder.flush();
-
-  // We can guarantee that all encodes are processed after a flush.
-  assert_equals(encoder.encodeQueueSize, 0);
-
-  assert_equals(output_chunks.length, 2);
-  assert_equals(output_chunks[0].timestamp, frame1.timestamp);
-  assert_equals(output_chunks[1].timestamp, frame2.timestamp);
-}, 'Test successful configure(), encode(), and flush()');
-
-promise_test(async t => {
-  let output_chunks = [];
-  let codecInit = getDefaultCodecInit(t);
-  codecInit.output = chunk => output_chunks.push(chunk);
-
-  let encoder = new VideoEncoder(codecInit);
-
-  // No encodes yet.
-  assert_equals(encoder.encodeQueueSize, 0);
-
-  let config = defaultConfig;
-
-  encoder.configure(config);
-
-  let frame1 = await createVideoFrame(640, 480, 0);
-  let frame2 = await createVideoFrame(640, 480, 33333);
-
-  encoder.encode(frame1.clone());
-  encoder.configure(config);
-
-  encoder.encode(frame2.clone());
-
-  await encoder.flush();
-
-  // We can guarantee that all encodes are processed after a flush.
-  assert_equals(encoder.encodeQueueSize, 0);
-
-  // The first frame may have been dropped when reconfiguring.
-  // This shouldn't happen, and should be fixed/called out in the spec, but
-  // this is preptively added to prevent flakiness.
-  // TODO: Remove these checks when implementations handle this correctly.
-  assert_true(output_chunks.length == 1 || output_chunks.length == 2);
-
-  if (output_chunks.length == 1) {
-    // If we only have one chunk frame, make sure we droped the frame that was
-    // in flight when we reconfigured.
-    assert_equals(output_chunks[0].timestamp, frame2.timestamp);
-  } else {
-    assert_equals(output_chunks[0].timestamp, frame1.timestamp);
-    assert_equals(output_chunks[1].timestamp, frame2.timestamp);
+  async function waitTillLoaded(img) {
+    if (img.complete)
+      return Promise.resolve();
+    return new Promise((resolve, reject) => {
+      img.onload = () => resolve()
+    });
   }
 
-  output_chunks = [];
+  async function generateBitmap(width, height) {
+    let img = document.getElementById('frame_image');
+    await waitTillLoaded(img);
+    return createImageBitmap(img,
+      {
+        resizeWidth: width,
+        resizeHeight: height
+      });
+  }
 
-  let frame3 = await createVideoFrame(640, 480, 66666);
-  let frame4 = await createVideoFrame(640, 480, 100000);
+  async function createVideoFrame(width, height, timestamp) {
+    let bitmap = await generateBitmap(width, height);
+    return new VideoFrame(bitmap, { timestamp: timestamp });
+  }
 
-  encoder.encode(frame3.clone());
+  promise_test(t => {
+    // VideoEncoderInit lacks required fields.
+    assert_throws_js(TypeError, () => { new VideoEncoder({}); });
 
-  // Verify that a failed call to configure does not change the encoder's state.
-  let badConfig = {...defaultConfig};
-  badConfig.codec = 'bogus';
-  assert_throws_js(TypeError, () => encoder.configure(badConfig));
+    // VideoEncoderInit has required fields.
+    let encoder = new VideoEncoder(getDefaultCodecInit(t));
 
-  encoder.encode(frame4.clone());
+    assert_equals(encoder.state, "unconfigured");
 
-  await encoder.flush();
+    encoder.close();
 
-  assert_equals(output_chunks[0].timestamp, frame3.timestamp);
-  assert_equals(output_chunks[1].timestamp, frame4.timestamp);
-}, 'Test successful encode() after re-configure().');
+    return endAfterEventLoopTurn();
+  }, 'Test VideoEncoder construction');
 
-promise_test(async t => {
-  let output_chunks = [];
-  let codecInit = getDefaultCodecInit(t);
-  codecInit.output = chunk => output_chunks.push(chunk);
+  promise_test(t => {
+    let encoder = new VideoEncoder(getDefaultCodecInit(t));
 
-  let encoder = new VideoEncoder(codecInit);
+    let badCodecsList = [
+      '',                         // Empty codec
+      'bogus',                    // Non exsitent codec
+      'vorbis',                   // Audio codec
+      'vp9',                      // Ambiguous codec
+      'video/webm; codecs="vp9"'  // Codec with mime type
+    ]
 
-  let timestamp = 33333;
-  let frame = await createVideoFrame(640, 480, timestamp);
+    testConfigurations(encoder, defaultConfig, badCodecsList);
 
-  encoder.configure(defaultConfig);
-  assert_equals(encoder.state, "configured");
+    return endAfterEventLoopTurn();
+  }, 'Test VideoEncoder.configure()');
 
-  encoder.encode(frame);
+  promise_test(async t => {
+    let output_chunks = [];
+    let codecInit = getDefaultCodecInit(t);
+    codecInit.output = chunk => output_chunks.push(chunk);
 
-  // |frame| is not longer valid since it has been destroyed.
-  assert_not_equals(frame.timestamp, timestamp);
-  assert_throws_dom("InvalidStateError", () => frame.clone());
+    let encoder = new VideoEncoder(codecInit);
 
-  encoder.close();
+    // No encodes yet.
+    assert_equals(encoder.encodeQueueSize, 0);
 
-  return endAfterEventLoopTurn();
-}, 'Test encoder consumes (destroys) frames.');
+    encoder.configure(defaultConfig);
 
-promise_test(async t => {
-  let encoder = new VideoEncoder(getDefaultCodecInit(t));
+    // Still no encodes.
+    assert_equals(encoder.encodeQueueSize, 0);
 
-  let frame = await createVideoFrame(640, 480, 0);
+    let frame1 = await createVideoFrame(640, 480, 0);
+    let frame2 = await createVideoFrame(640, 480, 33333);
 
-  return testClosedCodec(t, encoder, defaultConfig, frame);
-}, 'Verify closed VideoEncoder operations');
+    encoder.encode(frame1.clone());
+    encoder.encode(frame2.clone());
 
-promise_test(async t => {
-  let encoder = new VideoEncoder(getDefaultCodecInit(t));
+    // Could be 0, 1, or 2. We can't guarantee this check runs before the UA has
+    // processed the encodes.
+    assert_true(encoder.encodeQueueSize >= 0 && encoder.encodeQueueSize <= 2)
 
-  let frame = await createVideoFrame(640, 480, 0);
+    await encoder.flush();
 
-  return testUnconfiguredCodec(t, encoder, frame);
-}, 'Verify unconfigured VideoEncoder operations');
+    // We can guarantee that all encodes are processed after a flush.
+    assert_equals(encoder.encodeQueueSize, 0);
 
-promise_test(async t => {
-  let encoder = new VideoEncoder(getDefaultCodecInit(t));
+    assert_equals(output_chunks.length, 2);
+    assert_equals(output_chunks[0].timestamp, frame1.timestamp);
+    assert_equals(output_chunks[1].timestamp, frame2.timestamp);
+  }, 'Test successful configure(), encode(), and flush()');
 
-  let frame = await createVideoFrame(640, 480, 0);
-  frame.destroy();
+  promise_test(async t => {
+    let callbacks_before_reset = 0;
+    let callbacks_after_reset = 0;
+    let codecInit = getDefaultCodecInit(t);
+    codecInit.output = chunk => {
+      if (chunk.timestamp % 2 == 0) {
+        // pre-reset frames have even timestamp
+        callbacks_before_reset++;
+      } else {
+        // after-reset frames have odd timestamp
+        callbacks_after_reset++;
+      }
+    }
 
-  encoder.configure(defaultConfig);
+    let encoder = new VideoEncoder(codecInit);
+    encoder.configure(defaultConfig);
+    await encoder.flush();
 
-  frame.destroy();
-  assert_throws_dom("OperationError", () => {
-    encoder.encode(frame)
-  });
-}, 'Verify encoding destroyed frames throws.');
+    let frames = [];
+    for (let i = 0; i < 200; i++) {
+      let frame = await createVideoFrame(640, 480, i * 40_000);
+      frames.push(frame);
+    }
+
+    for (frame of frames)
+      encoder.encode(frame);
+
+    // Wait for the first frame to be encoded
+    await t.step_wait(() => callbacks_before_reset > 0,
+      "Encoded outputs started coming", 10000, 1);
+
+    let saved_callbacks_before_reset = callbacks_before_reset;
+    assert_greater_than(callbacks_before_reset, 0);
+    assert_less_than_equal(callbacks_before_reset, frames.length);
+
+    encoder.reset();
+    assert_equals(encoder.encodeQueueSize, 0);
+
+    let newConfig = { ...defaultConfig };
+    newConfig.width = 800;
+    newConfig.height = 600;
+    encoder.configure(newConfig);
+
+    for (let i = frames.length; i < frames.length + 5; i++) {
+      let frame = await createVideoFrame(800, 600, i * 40_000 + 1);
+      encoder.encode(frame);
+    }
+    await encoder.flush();
+    assert_equals(callbacks_after_reset, 5);
+    assert_equals(saved_callbacks_before_reset, callbacks_before_reset);
+    assert_equals(encoder.encodeQueueSize, 0);
+  }, 'Test successful reset() and re-confiugre()');
+
+  promise_test(async t => {
+    let output_chunks = [];
+    let codecInit = getDefaultCodecInit(t);
+    codecInit.output = chunk => output_chunks.push(chunk);
+
+    let encoder = new VideoEncoder(codecInit);
+
+    // No encodes yet.
+    assert_equals(encoder.encodeQueueSize, 0);
+
+    let config = defaultConfig;
+
+    encoder.configure(config);
+
+    let frame1 = await createVideoFrame(640, 480, 0);
+    let frame2 = await createVideoFrame(640, 480, 33333);
+
+    encoder.encode(frame1.clone());
+    encoder.configure(config);
+
+    encoder.encode(frame2.clone());
+
+    await encoder.flush();
+
+    // We can guarantee that all encodes are processed after a flush.
+    assert_equals(encoder.encodeQueueSize, 0);
+
+    // The first frame may have been dropped when reconfiguring.
+    // This shouldn't happen, and should be fixed/called out in the spec, but
+    // this is preptively added to prevent flakiness.
+    // TODO: Remove these checks when implementations handle this correctly.
+    assert_true(output_chunks.length == 1 || output_chunks.length == 2);
+
+    if (output_chunks.length == 1) {
+      // If we only have one chunk frame, make sure we droped the frame that was
+      // in flight when we reconfigured.
+      assert_equals(output_chunks[0].timestamp, frame2.timestamp);
+    } else {
+      assert_equals(output_chunks[0].timestamp, frame1.timestamp);
+      assert_equals(output_chunks[1].timestamp, frame2.timestamp);
+    }
+
+    output_chunks = [];
+
+    let frame3 = await createVideoFrame(640, 480, 66666);
+    let frame4 = await createVideoFrame(640, 480, 100000);
+
+    encoder.encode(frame3.clone());
+
+    // Verify that a failed call to configure does not change the encoder's state.
+    let badConfig = { ...defaultConfig };
+    badConfig.codec = 'bogus';
+    assert_throws_js(TypeError, () => encoder.configure(badConfig));
+
+    encoder.encode(frame4.clone());
+
+    await encoder.flush();
+
+    assert_equals(output_chunks[0].timestamp, frame3.timestamp);
+    assert_equals(output_chunks[1].timestamp, frame4.timestamp);
+  }, 'Test successful encode() after re-configure().');
+
+  promise_test(async t => {
+    let output_chunks = [];
+    let codecInit = getDefaultCodecInit(t);
+    codecInit.output = chunk => output_chunks.push(chunk);
+
+    let encoder = new VideoEncoder(codecInit);
+
+    let timestamp = 33333;
+    let frame = await createVideoFrame(640, 480, timestamp);
+
+    encoder.configure(defaultConfig);
+    assert_equals(encoder.state, "configured");
+
+    encoder.encode(frame);
+
+    // |frame| is not longer valid since it has been destroyed.
+    assert_not_equals(frame.timestamp, timestamp);
+    assert_throws_dom("InvalidStateError", () => frame.clone());
+
+    encoder.close();
+
+    return endAfterEventLoopTurn();
+  }, 'Test encoder consumes (destroys) frames.');
+
+  promise_test(async t => {
+    let encoder = new VideoEncoder(getDefaultCodecInit(t));
+
+    let frame = await createVideoFrame(640, 480, 0);
+
+    return testClosedCodec(t, encoder, defaultConfig, frame);
+  }, 'Verify closed VideoEncoder operations');
+
+  promise_test(async t => {
+    let encoder = new VideoEncoder(getDefaultCodecInit(t));
+
+    let frame = await createVideoFrame(640, 480, 0);
+
+    return testUnconfiguredCodec(t, encoder, frame);
+  }, 'Verify unconfigured VideoEncoder operations');
+
+  promise_test(async t => {
+    let encoder = new VideoEncoder(getDefaultCodecInit(t));
+
+    let frame = await createVideoFrame(640, 480, 0);
+    frame.destroy();
+
+    encoder.configure(defaultConfig);
+
+    frame.destroy();
+    assert_throws_dom("OperationError", () => {
+      encoder.encode(frame)
+    });
+  }, 'Verify encoding destroyed frames throws.');
 
 </script>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/conftest.py b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/conftest.py
index 970f7b7dd9b..188f8ddbb5e 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/conftest.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/conftest.py
@@ -32,6 +32,22 @@ def mouse_chain(session):
         {"pointerType": "mouse"})
 
 
+@pytest.fixture
+def touch_chain(session):
+    return session.actions.sequence(
+        "pointer",
+        "pointer_id",
+        {"pointerType": "touch"})
+
+
+@pytest.fixture
+def pen_chain(session):
+    return session.actions.sequence(
+        "pointer",
+        "pointer_id",
+        {"pointerType": "pen"})
+
+
 @pytest.fixture
 def none_chain(session):
     return session.actions.sequence("none", "none_id")
@@ -66,3 +82,8 @@ def test_actions_page(session, url):
 @pytest.fixture
 def test_actions_scroll_page(session, url):
     session.url = url("/webdriver/tests/perform_actions/support/test_actions_scroll_wdspec.html")
+
+
+@pytest.fixture
+def test_actions_pointer_page(session, url):
+    session.url = url("/webdriver/tests/perform_actions/support/test_actions_pointer_wdspec.html")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer.py b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer.py
index ad546921460..1cb824fc8ec 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/pointer.py
@@ -115,6 +115,85 @@ def test_click_navigation(session, url):
     Poll(session, message=error_message).until(lambda s: s.url == destination)
 
 
+def test_pen_pointer_properties(session, test_actions_pointer_page, pen_chain):
+    pointerArea = session.find.css("#pointerArea", all=False)
+    center = get_inview_center(pointerArea.rect, get_viewport_rect(session))
+    pen_chain.pointer_move(0, 0, origin=pointerArea) \
+        .pointer_down(pressure=0.36, tilt_x=-72, tilt_y=9, twist=86) \
+        .pointer_move(10, 10, origin=pointerArea) \
+        .pointer_up() \
+        .pointer_move(80, 50, origin=pointerArea) \
+        .perform()
+    events = get_events(session)
+    assert len(events) == 10
+    event_types = [e["type"] for e in events]
+    assert ["pointerover", "pointerenter", "pointermove", "pointerdown",
+            "pointerover", "pointerenter", "pointermove", "pointerup",
+            "pointerout", "pointerleave"] == event_types
+    assert events[3]["type"] == "pointerdown"
+    assert events[3]["pageX"] == pytest.approx(center["x"], abs=1.0)
+    assert events[3]["pageY"] == pytest.approx(center["y"], abs=1.0)
+    assert events[3]["target"] == "pointerArea"
+    assert events[3]["pointerType"] == "pen"
+    # The default value of width and height for mouse and pen inputs is 1
+    assert round(events[3]["width"], 2) == 1
+    assert round(events[3]["height"], 2) == 1
+    assert round(events[3]["pressure"], 2) == 0.36
+    assert events[3]["tiltX"] == -72
+    assert events[3]["tiltY"] == 9
+    assert events[3]["twist"] == 86
+    assert events[6]["type"] == "pointermove"
+    assert events[6]["pageX"] == pytest.approx(center["x"]+10, abs=1.0)
+    assert events[6]["pageY"] == pytest.approx(center["y"]+10, abs=1.0)
+    assert events[6]["target"] == "pointerArea"
+    assert events[6]["pointerType"] == "pen"
+    assert round(events[6]["width"], 2) == 1
+    assert round(events[6]["height"], 2) == 1
+    # The default value of pressure for all inputs is 0.5, other properties are 0
+    assert round(events[6]["pressure"], 2) == 0.5
+    assert events[6]["tiltX"] == 0
+    assert events[6]["tiltY"] == 0
+    assert events[6]["twist"] == 0
+
+
+def test_touch_pointer_properties(session, test_actions_pointer_page, touch_chain):
+    pointerArea = session.find.css("#pointerArea", all=False)
+    center = get_inview_center(pointerArea.rect, get_viewport_rect(session))
+    touch_chain.pointer_move(0, 0, origin=pointerArea) \
+        .pointer_down(width=23, height=31, pressure=0.78, tilt_x=21, tilt_y=-8, twist=355) \
+        .pointer_move(10, 10, origin=pointerArea, width=39, height=35, pressure=0.91, tilt_x=-19, tilt_y=62, twist=345) \
+        .pointer_up() \
+        .pointer_move(80, 50, origin=pointerArea) \
+        .perform()
+    events = get_events(session)
+    assert len(events) == 7
+    event_types = [e["type"] for e in events]
+    assert ["pointerover", "pointerenter", "pointerdown", "pointermove",
+            "pointerup", "pointerout", "pointerleave"] == event_types
+    assert events[2]["type"] == "pointerdown"
+    assert events[2]["pageX"] == pytest.approx(center["x"], abs=1.0)
+    assert events[2]["pageY"] == pytest.approx(center["y"], abs=1.0)
+    assert events[2]["target"] == "pointerArea"
+    assert events[2]["pointerType"] == "touch"
+    assert round(events[2]["width"], 2) == 23
+    assert round(events[2]["height"], 2) == 31
+    assert round(events[2]["pressure"], 2) == 0.78
+    assert events[2]["tiltX"] == 21
+    assert events[2]["tiltY"] == -8
+    assert events[2]["twist"] == 355
+    assert events[3]["type"] == "pointermove"
+    assert events[3]["pageX"] == pytest.approx(center["x"]+10, abs=1.0)
+    assert events[3]["pageY"] == pytest.approx(center["y"]+10, abs=1.0)
+    assert events[3]["target"] == "pointerArea"
+    assert events[3]["pointerType"] == "touch"
+    assert round(events[3]["width"], 2) == 39
+    assert round(events[3]["height"], 2) == 35
+    assert round(events[3]["pressure"], 2) == 0.91
+    assert events[3]["tiltX"] == -19
+    assert events[3]["tiltY"] == 62
+    assert events[3]["twist"] == 345
+
+
 @pytest.mark.parametrize("drag_duration", [0, 300, 800])
 @pytest.mark.parametrize("dx, dy", [
     (20, 0), (0, 15), (10, 15), (-20, 0), (10, -15), (-10, -15)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/support/test_actions_pointer_wdspec.html b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/support/test_actions_pointer_wdspec.html
new file mode 100644
index 00000000000..f1fd9b2da3f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/perform_actions/support/test_actions_pointer_wdspec.html
@@ -0,0 +1,102 @@
+<!doctype html>
+<meta charset=utf-8>
+<html>
+<head>
+    <title>Test Actions</title>
+    <style>
+      div { padding:0px; margin: 0px; }
+      #trackPointer { position: fixed; }
+      #resultContainer { width: 600px; height: 60px; }
+      .area { width: 100px; height: 50px; background-color: #ccc; }
+    </style>
+    <script>
+        "use strict";
+        var els = {};
+        var allEvents = { events: [] };
+        function displayMessage(message) {
+            document.getElementById("events").innerHTML = "<p>" + message + "</p>";
+        }
+
+        function appendMessage(message) {
+            document.getElementById("events").innerHTML += "<p>" + message + "</p>";
+        }
+
+        function recordPointerEvent(event) {
+          if (event.type === "contextmenu") {
+            event.preventDefault();
+          }
+          allEvents.events.push({
+            "type": event.type,
+            "button": event.button,
+            "buttons": event.buttons,
+            "pageX": event.pageX,
+            "pageY": event.pageY,
+            "ctrlKey": event.ctrlKey,
+            "metaKey": event.metaKey,
+            "altKey": event.altKey,
+            "shiftKey": event.shiftKey,
+            "target": event.target.id,
+            "pointerType": event.pointerType,
+            "width": event.width,
+            "height": event.height,
+            "pressure": event.pressure,
+            "tangentialPressure": event.tangentialPressure,
+            "tiltX": event.tiltX,
+            "tiltY": event.tiltY,
+            "twist": event.twist,
+            "altitudeAngle": event.altitudeAngle,
+            "azimuthAngle": event.azimuthAngle
+          });
+          appendMessage(event.type + " " +
+              "button: " + event.button + ", " +
+              "pageX: " + event.pageX + ", " +
+              "pageY: " + event.pageY + ", " +
+              "button: " + event.button + ", " +
+              "buttons: " + event.buttons + ", " +
+              "ctrlKey: " + event.ctrlKey + ", " +
+              "altKey: " + event.altKey + ", " +
+              "metaKey: " + event.metaKey + ", " +
+              "shiftKey: " + event.shiftKey + ", " +
+              "target id: " + event.target.id + ", " +
+              "pointerType: " + event.pointerType + ", " +
+              "width: " + event.width + ", " +
+              "height: " + event.height + ", " +
+              "pressure: " + event.pressure + ", " +
+              "tangentialPressure: " + event.tangentialPressure + ", " +
+              "tiltX: " + event.tiltX + ", " +
+              "tiltY: " + event.tiltY + ", " +
+              "twist: " + event.twist + ", " +
+              "altitudeAngle: " + event.altitudeAngle + ", " +
+              "azimuthAngle: " + event.azimuthAngle);
+        }
+
+        function resetEvents() {
+          allEvents.events.length = 0;
+          displayMessage("");
+        }
+
+        document.addEventListener("DOMContentLoaded", function() {
+          var pointerArea = document.getElementById("pointerArea");
+          pointerArea.addEventListener("pointerdown", recordPointerEvent);
+          pointerArea.addEventListener("pointermove", recordPointerEvent);
+          pointerArea.addEventListener("pointerup", recordPointerEvent);
+          pointerArea.addEventListener("pointerover", recordPointerEvent);
+          pointerArea.addEventListener("pointerenter", recordPointerEvent);
+          pointerArea.addEventListener("pointerout", recordPointerEvent);
+          pointerArea.addEventListener("pointerleave", recordPointerEvent);
+        });
+    </script>
+</head>
+<body>
+  <div id="trackPointer" class="block"></div>
+  <div>
+    <h2>PointerReporter</h2>
+    <div id="pointerArea" class="area">
+    </div>
+  </div>
+  <div id="resultContainer">
+    <h2>Events</h2>
+    <div id="events"></div>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/wpt b/tests/wpt/web-platform-tests/wpt
index 329ea66852c..9fea20d0d9b 100755
--- a/tests/wpt/web-platform-tests/wpt
+++ b/tests/wpt/web-platform-tests/wpt
@@ -7,7 +7,20 @@ if __name__ == "__main__":
     commands = wpt.load_commands()
     py3only = commands[args.command]["py3only"]
 
-    if (args.py3 or py3only) and sys.version_info.major < 3:
+    if (args.py2) and sys.version_info.major > 2:
+        if py3only:
+            sys.stderr.write("This command only works with Python 3\n")
+            sys.exit(1)
+        from subprocess import call
+        try:
+            sys.exit(call(['python2'] + sys.argv))
+        except OSError as e:
+            if e.errno == 2:
+                sys.stderr.write("python2 is needed to run this command\n")
+                sys.exit(1)
+            else:
+                raise
+    elif (args.py3 or py3only) and sys.version_info.major < 3:
         from subprocess import call
         try:
             sys.exit(call(['python3'] + sys.argv))