From a37a9f68b810e0e7d2a2d4cce4b9e5706288c434 Mon Sep 17 00:00:00 2001
From: Servo WPT Sync <32481905+servo-wpt-sync@users.noreply.github.com>
Date: Sun, 15 Dec 2024 04:52:07 +0100
Subject: [PATCH] Update web-platform-tests to revision
 b'38623a53d6598cb7aab4be8a810102b352a652df' (#34622)

Signed-off-by: WPT Sync Bot <ghbot+wpt-sync@servo.org>
---
 .../url/url-in-tags-revoke.window.js.ini      |    3 -
 .../css/css-cascade/scope-nesting.html.ini    |    3 +
 .../generic-family-keywords-001.html.ini      |    3 -
 .../gap-decorations-style-computed.html.ini   |   36 +
 ...he-check-pseudo-element.tentative.html.ini |    2 -
 ...ct-arrow-pseudo-element.tentative.html.ini |    2 -
 ...keyword-sizes-on-replaced-element.html.ini |   12 +
 .../stretch/block-height-1.html.ini           |   27 +-
 .../stretch/block-height-2.html.ini           |    6 +-
 .../vh_not_refreshing_on_chrome.html.ini      |    1 +
 ...QueryList-addListener-handleEvent.html.ini |    9 +
 ...ryList-addListener-removeListener.html.ini |   12 +
 ...yList-extends-EventTarget-interop.html.ini |   12 +
 ...ediaQueryList-extends-EventTarget.html.ini |    9 +
 .../cssom-view/MediaQueryListEvent.html.ini   |    6 +
 ...llWidthHeight-negative-margin-002.html.ini |   48 +
 ...scrollWidthHeightWhenNotScrollable.xht.ini |    3 +
 .../css/cssom/serialize-values.html.ini       |    3 +
 .../cssom/stylesheet-same-origin.sub.html.ini |    4 -
 .../dom/idlharness.window.js.ini              |   53 -
 .../tentative/Node-moveBefore.html.ini        |   12 +
 .../tentative/observable-reduce.any.js.ini    |    6 +
 .../domxpath/booleans.html.ini                |   21 +
 .../domxpath/document.tentative.html.ini      |    3 +
 .../domxpath/evaluator-constructor.html.ini   |    3 +
 .../evaluator-cross-realm.tentative.html.ini  |   12 +
 ...ator-different-document.tentative.html.ini |   24 +
 .../expression-cross-realm.tentative.html.ini |   12 +
 ...sion-different-document.tentative.html.ini |   24 +
 .../domxpath/fn-concat.html.ini               |    3 +
 .../domxpath/fn-contains.html.ini             |    3 +
 .../domxpath/fn-lang.html.ini                 |   21 +
 .../domxpath/fn-normalize-space.html.ini      |    6 +
 .../domxpath/fn-starts-with.html.ini          |    3 +
 .../domxpath/fn-substring-after.html.ini      |    3 +
 .../domxpath/fn-substring-before.html.ini     |    3 +
 .../domxpath/fn-substring.html.ini            |    3 +
 .../domxpath/fn-translate.html.ini            |    3 +
 .../domxpath/lexical-structure.html.ini       |    6 +
 .../domxpath/node-sets.html.ini               |    3 +
 .../domxpath/numbers.html.ini                 |   15 +
 .../domxpath/predicates.html.ini              |    3 +
 ...k-interface-cross-realm.tentative.html.ini |   15 +
 .../resolver-callback-interface.html.ini      |   30 +
 .../resolver-non-string-result.html.ini       |   18 +
 .../domxpath/text-html-attributes.html.ini    |   45 +
 .../domxpath/text-html-elements.html.ini      |   33 +
 .../domxpath/xml_xpath_runner.html.ini        | 3072 +++++++++++++++++
 ...athevaluatorbase-creatensresolver.html.ini |    2 +
 ...edirect-back-to-original-origin.any.js.ini |    6 -
 ...remote-read-remote-image-redirect.html.ini |    4 -
 ...css-font-face.https.sub.tentative.html.ini |    3 +
 .../css-font-face.sub.tentative.html.ini      |    6 +
 .../css-images.https.sub.tentative.html.ini   |   24 +
 .../css-images.sub.tentative.html.ini         |   27 +
 .../generated/element-area.sub.html.ini       |    9 +
 .../element-audio.https.sub.html.ini          |    3 +
 .../element-embed.https.sub.html.ini          |    6 +
 .../generated/element-embed.sub.html.ini      |    9 +
 .../generated/element-frame.sub.html.ini      |    9 +
 ...-img-environment-change.https.sub.html.ini |   28 +-
 ...lement-img-environment-change.sub.html.ini |   40 +-
 .../generated/element-img.https.sub.html.ini  |    6 +
 .../element-input-image.https.sub.html.ini    |    6 +
 .../element-input-image.sub.html.ini          |    9 +
 .../element-link-icon.https.sub.html.ini      |    6 +
 .../generated/element-link-icon.sub.html.ini  |    9 +
 ...-link-prefetch.https.optional.sub.html.ini |    3 +
 .../element-picture.https.sub.html.ini        |    9 +
 .../element-script.https.sub.html.ini         |    3 +
 .../element-video-poster.https.sub.html.ini   |    6 +
 .../element-video-poster.sub.html.ini         |    9 +
 .../element-video.https.sub.html.ini          |    3 +
 ...fetch-via-serviceworker.https.sub.html.ini |   12 +
 .../generated/fetch.https.sub.html.ini        |    3 +
 .../generated/form-submission.sub.html.ini    |   18 +
 .../generated/header-link.https.sub.html.ini  |   12 +
 .../generated/header-link.sub.html.ini        |   18 +
 ...header-refresh.https.optional.sub.html.ini |    6 +
 .../header-refresh.optional.sub.html.ini      |    9 +
 .../generated/svg-image.https.sub.html.ini    |    6 +
 .../metadata/generated/svg-image.sub.html.ini |    9 +
 .../window-history.https.sub.html.ini         |   12 +
 .../generated/window-history.sub.html.ini     |   18 +
 ...dedicated-importscripts.https.sub.html.ini |    3 +
 ...c-aboutblank-navigate-immediately.html.ini |    3 +
 ...avigation-unload-same-origin.window.js.ini |    3 +
 .../refresh/same-document-refresh.html.ini    |    3 +
 .../embedded-opener-remove-frame.html.ini     |    3 -
 ...ret-position-edge-cases.tentative.html.ini |    3 +-
 ...re.caret-position-edges.tentative.html.ini |   30 +-
 ....measure.caret-position.tentative.html.ini |  120 +-
 ...ret-position-edge-cases.tentative.html.ini |    3 +-
 ...osition-edge-cases.tentative.worker.js.ini |    3 +-
 ...re.caret-position-edges.tentative.html.ini |   30 +-
 ...ret-position-edges.tentative.worker.js.ini |   30 +-
 ....measure.caret-position.tentative.html.ini |  120 +-
 .../html/dom/idlharness.https.html.ini        |    6 -
 ...frame-loading-lazy-nav-link-click.html.ini |    3 -
 .../iframe_sandbox_popups_escaping-2.html.ini |    3 +-
 .../viewport-change.html.ini                  |   11 +-
 .../input-form-detach-style-crash.html.ini    |    2 -
 .../popovers/popover-minimum-role.html.ini    |    3 +
 .../module-static-import-delayed.html.ini     |    3 -
 .../child-document-raf-order.html.ini         |    3 -
 .../nav2-test-timing-persistent.html.ini      |    7 +
 .../no-referrer/iframe-tag.http.html.ini      |   37 -
 .../iframe-tag.http.html.ini                  |   30 -
 .../req.attr/origin/iframe-tag.http.html.ini  |   36 -
 .../same-origin/iframe-tag.http.html.ini      |   24 -
 .../iframe-tag.http.html.ini                  |   30 -
 .../strict-origin/iframe-tag.http.html.ini    |   36 -
 .../generic/iframe-src-change.html.ini        |    4 -
 .../Worker/Worker-constructor.html.ini        |    2 +
 .../xhr/open-url-multi-window-5.htm.ini       |    3 -
 ...cross-partition-navigation.https.html.ini} |    5 +-
 ...tition-navigation.tentative.https.html.ini |   13 -
 ...-partition-worker-creation.https.html.ini} |    2 +-
 ...n-worker-creation.tentative.https.html.ini |    7 -
 .../BlobURL/cross-partition.https.html.ini}   |    2 +-
 .../cross-partition.tentative.https.html.ini  |   25 -
 tests/wpt/meta/MANIFEST.json                  | 2979 +++++++++++++---
 .../css/css-cascade/scope-nesting.html.ini    |    3 +
 .../container-for-cue.html.ini                |    2 -
 .../container-units-auto.html.ini             |    3 +
 .../size-container-auto-height.html.ini       |    3 +
 .../aspect-ratio-intrinsic-size-010.html.ini  |    2 +
 .../flexbox-flex-wrap-flexing-003.html.ini    |    2 +
 .../gap-decorations-style-computed.html.ini   |   36 +
 .../gap-decorations-style-valid.html.ini      |   45 +
 ...em-grid-container-auto-repeat-002.html.ini |    2 +
 ...id-template-shorthand-composition.html.ini |    6 -
 .../parsing/masonry-fill-computed.html.ini    |    6 +
 .../parsing/masonry-fill-valid.html.ini       |    6 +
 .../highlight-cascade-010.html.ini            |    3 +
 ...t-1.html.ini => block-height-001.html.ini} |    2 +-
 .../block-height-002.tentative.html.ini       |    6 +
 .../block-height-003.tentative.html.ini       |    2 +
 .../block-height-004.tentative.html.ini       |   18 +
 .../block-height-005.tentative.html.ini       |   12 +
 .../block-height-006.tentative.html.ini       |    2 +
 .../stretch/block-height-2.html.ini           |    6 -
 .../stretch/content-contribution-001.html.ini |    9 +
 .../vh_not_refreshing_on_chrome.html.ini      |    2 +
 ...QueryList-addListener-handleEvent.html.ini |    9 +
 ...ryList-addListener-removeListener.html.ini |   14 +-
 ...yList-extends-EventTarget-interop.html.ini |   12 +
 ...ediaQueryList-extends-EventTarget.html.ini |    9 +
 .../cssom-view/MediaQueryListEvent.html.ini   |    6 +
 ...llWidthHeight-negative-margin-002.html.ini |   48 +
 ...scrollWidthHeightWhenNotScrollable.xht.ini |    3 +
 .../meta/css/cssom/serialize-values.html.ini  |    3 +
 .../ShadowRoot-importNode.tentative.html.ini  |    9 +
 .../ShadowRoot-innerHTML.tentative.html.ini   |   15 +
 .../tentative/Node-moveBefore.html.ini        |   12 +
 .../tentative/observable-reduce.any.js.ini    |    6 +
 ...css-font-face.https.sub.tentative.html.ini |    3 +
 .../css-font-face.sub.tentative.html.ini      |    9 +
 .../css-images.https.sub.tentative.html.ini   |   27 +
 .../css-images.sub.tentative.html.ini         |   36 +
 .../generated/element-area.sub.html.ini       |    9 +
 .../element-audio.https.sub.html.ini          |    3 +
 .../element-embed.https.sub.html.ini          |    6 +
 .../generated/element-embed.sub.html.ini      |    9 +
 .../generated/element-frame.sub.html.ini      |    9 +
 ...-img-environment-change.https.sub.html.ini |   38 +-
 ...lement-img-environment-change.sub.html.ini |    5 +-
 .../generated/element-img.https.sub.html.ini  |    6 +
 .../element-input-image.https.sub.html.ini    |    6 +
 .../element-input-image.sub.html.ini          |    9 +
 .../element-link-icon.https.sub.html.ini      |    6 +
 .../generated/element-link-icon.sub.html.ini  |    9 +
 ...-link-prefetch.https.optional.sub.html.ini |    3 +
 .../element-picture.https.sub.html.ini        |    9 +
 .../element-script.https.sub.html.ini         |    3 +
 .../element-video-poster.https.sub.html.ini   |    6 +
 .../element-video-poster.sub.html.ini         |    9 +
 .../element-video.https.sub.html.ini          |    3 +
 ...fetch-via-serviceworker.https.sub.html.ini |   12 +
 .../generated/fetch.https.sub.html.ini        |    3 +
 .../generated/form-submission.sub.html.ini    |   18 +
 .../generated/header-link.https.sub.html.ini  |   12 +
 .../generated/header-link.sub.html.ini        |   18 +
 ...header-refresh.https.optional.sub.html.ini |    6 +
 .../header-refresh.optional.sub.html.ini      |    9 +
 .../generated/svg-image.https.sub.html.ini    |    6 +
 .../metadata/generated/svg-image.sub.html.ini |    9 +
 .../window-history.https.sub.html.ini         |   12 +
 .../generated/window-history.sub.html.ini     |   18 +
 ...dedicated-importscripts.https.sub.html.ini |    3 +
 .../crashtests/chrome-1312699.html.ini        |    2 +
 .../content-visibility-crash.html.ini         |    2 +
 .../rendering/backdrop-iframe.html.ini        |    2 +
 .../rendering/backdrop-inherit.html.ini       |    2 +
 .../rendering/backdrop-object.html.ini        |    2 +
 .../fullscreen-root-fills-page.html.ini       |    2 +
 ...averse_the_history_write_onload_1.html.ini |    4 +
 ...-scoped-to-browsing-context-group.html.ini |    3 +
 ...swap-when-other-contexts-in-group.html.ini |    3 +
 .../createImageBitmap-transfer.html.ini       |    2 +-
 ...ret-position-edge-cases.tentative.html.ini |    3 -
 ...re.caret-position-edges.tentative.html.ini |   30 -
 ....measure.caret-position.tentative.html.ini |  120 -
 ...-from-offset-edge-cases.tentative.html.ini |    3 +
 ...index-from-offset-edges.tentative.html.ini |   30 +
 ...asure.index-from-offset.tentative.html.ini |  120 +
 ...sters-rendering-options.tentative.html.ini |    3 +
 ...ret-position-edge-cases.tentative.html.ini |    3 -
 ...osition-edge-cases.tentative.worker.js.ini |    3 -
 ...re.caret-position-edges.tentative.html.ini |   30 -
 ...ret-position-edges.tentative.worker.js.ini |   30 -
 ....measure.caret-position.tentative.html.ini |  120 -
 ...-from-offset-edge-cases.tentative.html.ini |    3 +
 ...-offset-edge-cases.tentative.worker.js.ini |    3 +
 ...index-from-offset-edges.tentative.html.ini |   30 +
 ...-from-offset-edges.tentative.worker.js.ini |   30 +
 ...asure.index-from-offset.tentative.html.ini |  120 +
 ...sters-rendering-options.tentative.html.ini |    3 +
 ...-rendering-options.tentative.worker.js.ini |    3 +
 ...ading-lazy-reload-location-reload.html.ini |    3 -
 .../iframe_sandbox_popups_escaping-2.html.ini |    2 +-
 ...rame_sandbox_popups_nonescaping-1.html.ini |    2 +-
 .../viewport-change.html.ini                  |   11 +-
 ...submits-with-commandfor.tentative.html.ini |    9 +
 .../border-rendering.tentative.html.ini       |    2 +
 ...-popup-with-wrapper-div.tentative.html.ini |    2 +
 .../picker-and-slotted.tentative.html.ini     |    2 +
 ...elect-appearance-active.tentative.html.ini |    2 +
 ...ppearance-custom-button.tentative.html.ini |    2 +
 ...ct-appearance-dark-mode.tentative.html.ini |    2 +
 ...pearance-default-button.tentative.html.ini |    2 +
 ...earance-disabled-option.tentative.html.ini |    2 +
 ...ck-bottom-left-scroller.tentative.html.ini |    2 +
 ...ce-fallback-bottom-left.tentative.html.ini |    2 +
 ...k-bottom-right-scroller.tentative.html.ini |    2 +
 ...e-fallback-bottom-right.tentative.html.ini |    2 +
 ...lback-top-left-scroller.tentative.html.ini |    2 +
 ...rance-fallback-top-left.tentative.html.ini |    2 +
 ...back-top-right-scroller.tentative.html.ini |    2 +
 ...ance-fallback-top-right.tentative.html.ini |    2 +
 ...earance-font-inheriting.tentative.html.ini |    2 +
 ...select-appearance-hover.tentative.html.ini |    2 +
 ...tgroup-legend-and-label.tentative.html.ini |    2 +
 ...earance-optgroup-legend.tentative.html.ini |    2 +
 ...ance-optgroup-rendering.tentative.html.ini |    2 +
 ...rance-option-with-label.tentative.html.ini |    2 +
 ...ce-picker-select-border.tentative.html.ini |    2 +
 ...-switching-invalidation.tentative.html.ini |    2 +
 ...riting-mode-vertical-lr.tentative.html.ini |    2 +
 ...riting-mode-vertical-rl.tentative.html.ini |    2 +
 ...e-wrong-picker-argument.tentative.html.ini |    2 +
 .../select-explicit-size.tentative.html.ini   |    2 +
 .../select-font-size.tentative.html.ini       |    2 +
 .../select-icon-color.tentative.html.ini      |    2 +
 ...lect-only-button-opt-in.tentative.html.ini |    2 +
 ...lect-only-picker-opt-in.tentative.html.ini |    2 +
 ...elect-open-invalidation.tentative.html.ini |    2 +
 .../select-option-images.tentative.html.ini   |    2 +
 ...-popover-exit-animation.tentative.html.ini |    2 +
 ...ect-second-child-button.tentative.html.ini |    2 +
 ...selected-value-behavior.tentative.html.ini |    2 +
 .../select-text-only.tentative.html.ini       |    2 +
 ...ng-context-group-change.tentative.html.ini |    6 +
 .../nav2-test-timing-persistent.html.ini      |    7 +
 ...nested-context-navigations-iframe.html.ini |   28 -
 .../meta/wasm/jsapi/jspi/notraps.any.js.ini   |   20 +
 .../DOMException-is-error.any.js.ini          |   27 +
 .../workers/WorkerGlobalScope-close.html.ini  |    3 -
 .../Worker/Worker-constructor.html.ini        |    2 +
 ... => cross-partition-navigation.https.html} |    0
 ...ross-partition-worker-creation.https.html} |    0
 ....https.html => cross-partition.https.html} |    0
 .../fire-error-event-exception.any.js         |  194 ++
 .../IndexedDB/fire-error-event-exception.html |  181 -
 ...ml => fire-success-event-exception.any.js} |   61 +-
 ...fire-upgradeneeded-event-exception.any.js} |   33 +-
 .../accname/name/comp_name_from_content.html  |   23 +
 tests/wpt/tests/close-watcher/basic.html      |    6 +-
 .../close-watcher/inside-event-listeners.html |   12 +-
 .../tests/compat/webkit-box-align-001.html    |   26 +
 .../reporting/report-clips-sample.https.html  |    2 +-
 .../linenumber.tentative.html                 |   22 +
 .../anchor-position-multicol-007.html         |   25 +
 .../anchor-position-multicol-008.html         |   25 +
 .../position-try-order-basic.html             |   14 +-
 .../position-try-order-position-area.html     |   14 +-
 .../tests/css/css-cascade/scope-nesting.html  |   34 +
 .../container-units-auto.html                 |   23 +
 .../size-container-auto-height.html           |   18 +
 .../css-content/parsing/content-invalid.html  |    7 -
 .../css-content/parsing/content-valid.html    |    6 -
 .../aspect-ratio-intrinsic-size-010.html      |   14 +
 .../flexbox-flex-wrap-flexing-002.html        |    8 +
 .../flexbox-flex-wrap-flexing-003.html        |    8 +
 .../gap-decorations-color-invalid.html        |    2 +-
 .../parsing/gap-decorations-color-valid.html  |    2 +-
 .../gap-decorations-style-computed.html       |   15 +-
 .../gap-decorations-style-invalid.html        |   24 +
 .../parsing/gap-decorations-style-valid.html  |   43 +
 ...x-item-grid-container-auto-repeat-001.html |   32 +
 ...x-item-grid-container-auto-repeat-002.html |   32 +
 .../grid-template-shorthand-composition.html  |   57 +-
 ...nt-single-stop-longer-hue-hsl-002-ref.html |   29 +
 ...adient-single-stop-longer-hue-hsl-002.html |   33 +
 .../parsing/masonry-fill-computed.html        |   21 +
 .../parsing/masonry-fill-invalid.html         |   22 +
 .../tentative/parsing/masonry-fill-valid.html |   19 +
 .../css/css-nesting/set-selector-text.html    |   44 +
 ...croller-then-scroll-content-into-view.html |   22 +
 .../content-change-then-scroll-into-view.html |   22 +
 .../webkit-line-clamp-abspos-001.html         |   35 +
 .../highlight-cascade-010.html                |   29 +
 ...-elements-affected-by-block-step-size.html |   57 +
 ...ments-not-affected-by-block-step-size.html |   57 +
 ...s-margins-affected-by-block-step-size.html |   26 +
 ...d-margins-affected-by-block-step-size.html |   26 +
 ...e-margins-affected-by-block-step-size.html |   27 +
 ...g-margins-affected-by-block-step-size.html |   26 +
 ...t-margins-affected-by-block-step-size.html |   26 +
 ...g-margins-affected-by-block-step-size.html |   26 +
 ...o-margins-affected-by-block-step-size.html |   26 +
 .../css/css-ruby/ruby-body-element-crash.html |   15 +
 .../parsing/scroll-start-target-computed.html |    8 +-
 .../parsing/scroll-start-target-invalid.html  |   14 +-
 .../parsing/scroll-start-target-valid.html    |    8 +-
 ...get-aligns-with-snap-align.tentative.html} |    8 +-
 ...ial-target-display-toggled.tentative.html} |   16 +-
 ...al-target-nested-container.tentative.html} |   50 +-
 ...scroll-initial-target-root.tentative.html} |   10 +-
 .../scroll-initial-target-rtl.tentative.html} |   12 +-
 ...scroll-initial-target-span.tentative.html} |   10 +-
 ...t-with-anchor-navigation-inner-frame.html} |    2 +-
 ...get-with-anchor-navigation.tentative.html} |   14 +-
 ...hash-fragment-navigation-inner-frame.html} |    2 +-
 ...h-hash-fragment-navigation.tentative.html} |   12 +-
 ...al-target-with-scroll-snap.tentative.html} |   10 +-
 ...get-with-scroll-start-root.tentative.html} |   10 +-
 ...l-target-with-scroll-start.tentative.html} |   12 +-
 ...with-text-fragment-navigation-target.html} |    4 +-
 ...h-text-fragment-navigation.tentative.html} |    8 +-
 ...h-user-programmatic-scroll.tentative.html} |   25 +-
 .../scroll-initial-target.tentative.html}     |   10 +-
 .../stash.py                                  |   10 +-
 ...uto-sizing-fit-content-percentage-001.html |   31 +
 ...uto-sizing-fit-content-percentage-002.html |   31 +
 ...uto-sizing-fit-content-percentage-003.html |   31 +
 ...uto-sizing-fit-content-percentage-004.html |   31 +
 ...ck-height-1.html => block-height-001.html} |    0
 .../stretch/block-height-002.tentative.html   |   62 +
 .../stretch/block-height-003-ref.html         |   16 +
 .../stretch/block-height-003.tentative.html   |   29 +
 .../stretch/block-height-004.tentative.html   |   99 +
 .../stretch/block-height-005.tentative.html   |   77 +
 .../stretch/block-height-006.tentative.html   |   36 +
 .../css-sizing/stretch/block-height-2.html    |   31 -
 .../stretch/content-contribution-001.html     |   58 +
 .../empty-render-target-crash.html            |   19 +
 .../at-rule-opt-in-change-with-script.html    |   39 +-
 .../chromium-paint-holding-timeout.html       |    6 +-
 .../scrollWidthHeight-contain-layout.html     |    2 +-
 ...scrollWidthHeight-negative-margin-002.html |    2 +-
 ...ht-overflow-visible-margin-collapsing.html |   51 +
 .../scrollWidthHeightWhenNotScrollable.xht    |    2 +-
 .../wpt/tests/css/cssom/serialize-values.html |    2 +-
 .../fecolormatrix-negative-ref.html           |   18 +
 .../fecolormatrix-negative.html               |   35 +
 .../ShadowRoot-importNode.tentative.html      |   82 +
 .../ShadowRoot-innerHTML.tentative.html       |  107 +
 .../tests/docs/writing-tests/testdriver.md    |    8 +-
 .../moveBefore/tentative/Node-moveBefore.html |   44 +-
 .../tentative/observable-inspect.any.js       |   50 +-
 .../tentative/observable-reduce.any.js        |   74 +-
 tests/wpt/tests/editing/data/delete.js        |   22 +
 tests/wpt/tests/editing/data/forwarddelete.js |   22 +
 tests/wpt/tests/editing/data/inserttext.js    |   11 +
 tests/wpt/tests/editing/data/multitest.js     |   60 +-
 .../editing/include/editor-test-utils.js      |    9 +
 ...ars-following-collapsible-white-space.html |  284 ++
 .../delete-to-make-editing-host-empty.html    |  111 +
 ...ars-following-collapsible-white-space.html |  284 ++
 .../resources/element-timing-helpers.js       |    9 +
 .../generated/audioworklet.https.sub.html     |   26 +
 .../css-font-face.https.sub.tentative.html    |   20 +
 .../css-font-face.sub.tentative.html          |   30 +
 .../css-images.https.sub.tentative.html       |  145 +
 .../generated/css-images.sub.tentative.html   |  210 ++
 .../generated/element-a.https.sub.html        |   40 +
 .../metadata/generated/element-a.sub.html     |   60 +
 .../generated/element-area.https.sub.html     |   40 +
 .../metadata/generated/element-area.sub.html  |   60 +
 .../generated/element-audio.https.sub.html    |   27 +
 .../metadata/generated/element-audio.sub.html |   39 +
 .../generated/element-embed.https.sub.html    |   21 +
 .../metadata/generated/element-embed.sub.html |   30 +
 .../generated/element-frame.https.sub.html    |   29 +
 .../metadata/generated/element-frame.sub.html |   42 +
 .../generated/element-iframe.https.sub.html   |   29 +
 .../generated/element-iframe.sub.html         |   42 +
 ...ment-img-environment-change.https.sub.html |   29 +
 .../element-img-environment-change.sub.html   |   42 +
 .../generated/element-img.https.sub.html      |   58 +
 .../metadata/generated/element-img.sub.html   |   84 +
 .../element-input-image.https.sub.html        |   21 +
 .../generated/element-input-image.sub.html    |   30 +
 .../element-link-icon.https.sub.html          |   31 +
 .../generated/element-link-icon.sub.html      |   45 +
 ...ment-link-prefetch.https.optional.sub.html |   31 +
 .../element-link-prefetch.optional.sub.html   |   45 +
 ...ement-meta-refresh.https.optional.sub.html |   24 +
 .../element-meta-refresh.optional.sub.html    |   36 +
 .../generated/element-picture.https.sub.html  |   93 +
 .../generated/element-picture.sub.html        |  135 +
 .../generated/element-script.https.sub.html   |   31 +
 .../generated/element-script.sub.html         |   90 +
 .../element-video-poster.https.sub.html       |   21 +
 .../generated/element-video-poster.sub.html   |   30 +
 .../generated/element-video.https.sub.html    |   27 +
 .../metadata/generated/element-video.sub.html |   39 +
 .../fetch-via-serviceworker.https.sub.html    |   62 +
 .../metadata/generated/fetch.https.sub.html   |   27 +
 .../fetch/metadata/generated/fetch.sub.html   |   39 +
 .../generated/form-submission.https.sub.html  |   44 +
 .../generated/form-submission.sub.html        |   66 +
 .../generated/header-link.https.sub.html      |   58 +
 .../metadata/generated/header-link.sub.html   |   84 +
 .../header-refresh.https.optional.sub.html    |   24 +
 .../header-refresh.optional.sub.html          |   36 +
 ...cript-module-import-dynamic.https.sub.html |   26 +
 .../script-module-import-dynamic.sub.html     |   39 +
 ...script-module-import-static.https.sub.html |   28 +
 .../script-module-import-static.sub.html      |   42 +
 .../generated/svg-image.https.sub.html        |   29 +
 .../metadata/generated/svg-image.sub.html     |   42 +
 .../generated/window-history.https.sub.html   |   44 +
 .../generated/window-history.sub.html         |   66 +
 .../generated/window-location.https.sub.html  |  112 +
 .../generated/window-location.sub.html        |  168 +
 .../worker-dedicated-constructor.sub.html     |   15 +
 ...ker-dedicated-importscripts.https.sub.html |   27 +
 .../worker-dedicated-importscripts.sub.html   |   39 +
 .../metadata/tools/fetch-metadata.conf.yml    |   81 +
 .../tentative/resources/ba-fledge-util.sub.js |    4 +-
 .../fledge/tentative/resources/ba-public-keys |    2 +-
 .../fullscreen/crashtests/chrome-1312699.html |   21 +
 .../crashtests/content-visibility-crash.html  |   31 +
 .../rendering/backdrop-green-ref.html         |    2 +
 .../fullscreen/rendering/backdrop-iframe.html |   22 +
 .../rendering/backdrop-inherit.html           |   27 +
 .../rendering/backdrop-object-ref.html        |   14 +
 .../fullscreen/rendering/backdrop-object.html |   23 +
 .../fullscreen-root-fills-page-ref.html       |   18 +
 .../rendering/fullscreen-root-fills-page.html |   47 +
 ...okup-scoped-to-browsing-context-group.html |   27 +
 ...ive-swap-when-other-contexts-in-group.html |   38 +
 .../duplicate-name-order.html                 |   55 +
 ...e.caret-position-edge-cases.tentative.html |   59 -
 ...ndex-from-offset-edge-cases.tentative.html |   59 +
 ...re.index-from-offset-edges.tentative.html} |   44 +-
 ....measure.index-from-offset.tentative.html} |  404 +--
 ...-clusters-rendering-options.tentative.html |   81 +
 ...e.caret-position-edge-cases.tentative.html |   48 -
 ...et-position-edge-cases.tentative.worker.js |   41 -
 ...ndex-from-offset-edge-cases.tentative.html |   48 +
 ...from-offset-edge-cases.tentative.worker.js |   41 +
 ...re.index-from-offset-edges.tentative.html} |   44 +-
 ...dex-from-offset-edges.tentative.worker.js} |   42 +-
 ....measure.index-from-offset.tentative.html} |  404 +--
 ...-clusters-rendering-options.tentative.html |   70 +
 ...ters-rendering-options.tentative.worker.js |   63 +
 .../html/canvas/tools/yaml-new/text.yaml      |  100 +-
 .../element-render-blocking-001.html          |   21 +-
 .../element-render-blocking-002.html          |   35 +-
 .../element-render-blocking-003.html          |   21 +-
 .../element-render-blocking-004.html          |   21 +-
 .../element-render-blocking-005.html          |   21 +-
 .../element-render-blocking-006.html          |   21 +-
 .../element-render-blocking-007.html          |   21 +-
 .../element-render-blocking-008.html          |   21 +-
 .../element-render-blocking-009.html          |   21 +-
 .../element-render-blocking-010.html          |   21 +-
 .../element-render-blocking-011.html          |   21 +-
 .../element-render-blocking-012.html          |   21 +-
 .../element-render-blocking-013.html          |   21 +-
 .../element-render-blocking-014.html          |   21 +-
 .../element-render-blocking-015.html          |   21 +-
 .../element-render-blocking-016.html          |   21 +-
 .../element-render-blocking-017.html          |   21 +-
 .../element-render-blocking-018.html          |   21 +-
 .../element-render-blocking-019.html          |   21 +-
 .../element-render-blocking-020.html          |   21 +-
 .../element-render-blocking-021.html          |   28 +-
 .../element-render-blocking-022.html          |   21 +-
 .../element-render-blocking-023.html          |   21 +-
 .../element-render-blocking-024.html          |   35 +-
 .../element-render-blocking-025.html          |   43 +-
 .../element-render-blocking-026.html          |   43 +-
 .../element-render-blocking-027.html          |   43 +-
 .../element-render-blocking-028.html          |   43 +-
 .../element-render-blocking-029.html          |   25 +-
 .../element-render-blocking-030.html          |   29 +-
 .../element-render-blocking-031.html          |   27 +-
 .../element-render-blocking-032.html          |   29 +-
 .../element-render-blocking-033.html          |   25 +-
 .../element-render-blocking-034.html          |   28 +-
 .../element-render-blocking-035.html          |   28 +-
 .../element-render-blocking-036.html          |   28 +-
 .../element-render-blocking-037.html          |   28 +-
 .../element-render-blocking-038.html          |   25 +-
 ...lick-resets-with-commandfor.tentative.html |   64 +
 ...ick-submits-with-commandfor.tentative.html |  110 +
 .../border-rendering-ref.html                 |   12 +
 .../border-rendering.tentative.html           |   15 +
 .../native-popup-with-wrapper-div-ref.html    |   19 +
 ...tive-popup-with-wrapper-div.tentative.html |   25 +
 .../picker-and-slotted-ref.html               |   32 +
 .../picker-and-slotted.tentative.html         |   41 +
 .../resources/customizable-select-styles.css  |   82 +
 .../resources/customizable-select-utils.js    |    8 +
 .../resources/fallback-helper.js              |  102 +
 .../select-appearance-active-ref.html         |   19 +
 .../select-appearance-active.tentative.html   |   30 +
 .../select-appearance-button-ref.html         |   14 +
 ...ct-appearance-custom-button.tentative.html |   27 +
 .../select-appearance-dark-mode-ref.html      |   20 +
 ...select-appearance-dark-mode.tentative.html |   30 +
 ...t-appearance-default-button.tentative.html |   27 +
 ...select-appearance-disabled-option-ref.html |   14 +
 ...-appearance-disabled-option.tentative.html |   27 +
 ...t-appearance-fallback-bottom-left-ref.html |   15 +
 ...nce-fallback-bottom-left-scroller-ref.html |   17 +
 ...llback-bottom-left-scroller.tentative.html |   13 +
 ...arance-fallback-bottom-left.tentative.html |   14 +
 ...-appearance-fallback-bottom-right-ref.html |   15 +
 ...ce-fallback-bottom-right-scroller-ref.html |   18 +
 ...lback-bottom-right-scroller.tentative.html |   14 +
 ...rance-fallback-bottom-right.tentative.html |   14 +
 ...lect-appearance-fallback-top-left-ref.html |   15 +
 ...arance-fallback-top-left-scroller-ref.html |   17 +
 ...-fallback-top-left-scroller.tentative.html |   13 +
 ...ppearance-fallback-top-left.tentative.html |   14 +
 ...ect-appearance-fallback-top-right-ref.html |   15 +
 ...rance-fallback-top-right-scroller-ref.html |   18 +
 ...fallback-top-right-scroller.tentative.html |   14 +
 ...pearance-fallback-top-right.tentative.html |   14 +
 ...select-appearance-font-inheriting-ref.html |   24 +
 ...-appearance-font-inheriting.tentative.html |   34 +
 .../select-appearance-hover-ref.html          |   12 +
 .../select-appearance-hover.tentative.html    |   29 +
 ...e-optgroup-legend-and-label.tentative.html |   30 +
 ...select-appearance-optgroup-legend-ref.html |   17 +
 ...-appearance-optgroup-legend.tentative.html |   30 +
 ...ect-appearance-optgroup-rendering-ref.html |   33 +
 ...pearance-optgroup-rendering.tentative.html |   36 +
 ...ppearance-option-with-label.tentative.html |   27 +
 ...t-appearance-picker-select-border-ref.html |   19 +
 ...arance-picker-select-border.tentative.html |   29 +
 ...appearance-switching-invalidation-ref.html |   24 +
 ...ance-switching-invalidation.tentative.html |   37 +
 ...pearance-writing-mode-vertical-lr-ref.html |   20 +
 ...ce-writing-mode-vertical-lr.tentative.html |   29 +
 ...pearance-writing-mode-vertical-rl-ref.html |   20 +
 ...ce-writing-mode-vertical-rl.tentative.html |   29 +
 ...rance-wrong-picker-argument.tentative.html |   29 +
 .../select-events.tentative.html              |   14 +-
 .../select-explicit-size-ref.tentative.html   |   17 +
 .../select-explicit-size.tentative.html       |   17 +
 .../select-font-size-ref.tentative.html       |   13 +
 .../select-font-size.tentative.html           |   20 +
 .../select-icon-color-ref.html                |   12 +
 .../select-icon-color.tentative.html          |   18 +
 .../select-multiple-base-appearance-ref.html  |   11 +
 .../select-multiple-base-appearance.html      |   20 +
 .../select-only-button-opt-in.tentative.html  |   26 +
 .../select-only-picker-opt-in-ref.html        |   16 +
 .../select-only-picker-opt-in.tentative.html  |   25 +
 .../select-open-invalidation-ref.html         |   20 +
 .../select-open-invalidation.tentative.html   |   38 +
 .../select-option-images-ref.html             |   14 +
 .../select-option-images.tentative.html       |   32 +
 .../select-popover-exit-animation-ref.html    |   15 +
 ...lect-popover-exit-animation.tentative.html |   40 +
 .../select-second-child-button-ref.html       |   14 +
 .../select-second-child-button.tentative.html |   27 +
 .../select-selected-value-behavior-ref.html   |   13 +
 ...ect-selected-value-behavior.tentative.html |   14 +
 .../select-text-only-ref.html                 |    7 +
 .../select-text-only.tentative.html           |   15 +
 .../selectedcontent.tentative.html            |   17 +-
 ...og-popover-closedby-complex.tentative.html |  197 +-
 .../dialog-requestclose.tentative.html        |   77 +-
 ...arget-button-event-dispatch.tentative.html |   42 +-
 ...owsing-context-group-change.tentative.html |   92 +
 .../popovers/popover-minimum-role.html        |   49 +-
 ...-speculative-fetch.tentative.optional.html |   26 +
 .../resources/no-speculative-fetch.sub.html   |   10 +
 .../no-speculative-fetch.sub.html.headers     |    1 +
 .../resources/stash.py                        |   11 +
 .../external-import-map-errors.html           |   40 +
 .../infrastructure/crashtests/testdriver.html |   13 +
 .../reftest/testdriver-in-ref.html.ini        |    5 +
 .../reftest/testdriver-child.html             |   19 +
 .../reftest/testdriver-iframe.sub.html        |   29 +
 .../reftest/testdriver-in-ref.html            |    6 +
 .../reftest/testdriver-print.html             |   23 +
 .../infrastructure/reftest/testdriver.html    |   21 +
 ...put-events-range-exceptions.tentative.html |  117 +
 .../first-paint-equals-lcp-text.html          |    2 +-
 tests/wpt/tests/lint.ignore                   |   15 +-
 .../tentative/loaf-paint-mixin.html           |   22 +
 .../tentative/loaf-timeline.html              |    5 +-
 .../tentative/resources/utils.js              |   19 +-
 .../nav2-test-timing-persistent.html          |   42 +-
 .../paint-timing/paint-timing-mixin.html      |    1 -
 ...ick_on_chorded_mouse_button.tentative.html |   91 +
 .../css/animation-range-scroll-timeline.html  |   62 +
 .../siblings-with-anonymous-timelines.html    |   79 +
 tests/wpt/tests/storage-access-api/helpers.js |   11 +-
 ...frame-navigation-relax.sub.https.window.js |    4 +-
 ...igin-iframe-navigation.sub.https.window.js |    9 +
 .../resources/handle-headers-non-retry.py     |   20 +
 .../resources/handle-headers-retry.py         |   43 +
 .../resources/header-helpers.py               |   58 +
 .../nested-handle-storage-access-headers.py   |    5 +
 .../retrieve-storage-access-headers.py        |   17 +
 ...cess-headers.tentative.https.sub.window.js |  487 +++
 .../types/SVGElement.ownerSVGElement-01.html  |   80 +
 .../types/SVGElement.ownerSVGElement-02.html  |   25 +
 .../helper-SVGElement.ownerSVGElement-02.svg  |    3 +
 tests/wpt/tests/tools/lint/lint.py            |    2 +-
 .../tests/tools/lint/tests/test_file_lints.py |   35 +-
 tests/wpt/tests/tools/manifest/item.py        |   18 +-
 tests/wpt/tests/tools/manifest/sourcefile.py  |    7 +-
 .../tools/manifest/tests/test_manifest.py     |   26 +
 tests/wpt/tests/tools/wpt/virtualenv.py       |   92 +-
 .../wptrunner/browsers/headless_shell.py      |   14 +-
 .../tools/wptrunner/wptrunner/environment.py  |   67 +-
 .../wptrunner/executors/executorchrome.py     |    4 +-
 .../wptrunner/executors/executorwebdriver.py  |  221 +-
 .../wptrunner/executors/message-queue.js      |   81 +
 .../wptrunner/executors/test-wait.js          |   43 +-
 .../wptrunner/wptrunner/testdriver-extra.js   |   13 +-
 .../wptrunner/wptrunner/testharnessreport.js  |   77 +-
 .../tools/wptrunner/wptrunner/testloader.py   |    2 +-
 .../wptrunner/tests/test_testloader.py        |    4 +-
 .../wptrunner/tests/test_wptrunner.py         |  196 +-
 .../wptrunner/wptrunner/wptcommandline.py     |    2 +
 .../tools/wptrunner/wptrunner/wptrunner.py    |   43 +-
 .../tools/wptrunner/wptrunner/wpttest.py      |   30 +-
 .../tests/tools/wptserve/wptserve/handlers.py |   14 +-
 ...bals-CSP-after-adoption-from-TT-realm.html |   74 +
 ...CSP-after-adoption-from-non-TT-realm.html} |    8 +-
 .../trusted-types/Element-setAttributeNS.html |   17 +-
 ...-assignment-to-Element-setAttributeNS.html |   27 +-
 ...arguments-and-default-policy-throwing.html |   22 +
 .../tests/trusted-types/support/helper.sub.js |    2 +-
 .../trusted-types-event-handlers.html         |   14 +
 .../wpt/tests/wasm/jsapi/jspi/notraps.any.js  |   82 +
 .../wpt/tests/wasm/jsapi/jspi/rejects.any.js  |    2 +-
 .../bidi/input/perform_actions/navigation.py  |   15 +-
 .../perform_actions/pointer_mouse_drag.py     |    6 +-
 .../bidi/storage/delete_cookies/partition.py  |    2 +-
 .../classic/perform_actions/navigation.py     |   10 +-
 .../classic/perform_actions/pointer_mouse.py  |    7 +-
 .../DOMException-is-error.any.js              |    9 +
 .../webnn/conformance_tests/gemm.https.any.js | 1150 ++++++
 .../layer_normalization.https.any.js          |  101 +
 .../conformance_tests/lstm_cell.https.any.js  |   66 +-
 .../conformance_tests/matmul.https.any.js     |  444 +++
 tests/wpt/tests/webnn/resources/utils.js      |  129 +-
 .../setParameters-maxFramerate.https.html     |   49 +-
 .../tex-2d-alpha-alpha-unsigned_byte.html.ini |    6 +
 671 files changed, 22362 insertions(+), 3510 deletions(-)
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-pseudo/parsing/the-check-pseudo-element.tentative.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/css/css-pseudo/parsing/the-select-arrow-pseudo-element.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryList-extends-EventTarget.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryListEvent.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/booleans.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/document.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/evaluator-constructor.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/evaluator-cross-realm.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/evaluator-different-document.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/expression-cross-realm.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/expression-different-document.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/fn-concat.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/fn-contains.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/fn-lang.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/fn-normalize-space.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/fn-starts-with.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/fn-substring-after.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/fn-substring-before.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/fn-substring.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/fn-translate.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/lexical-structure.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/node-sets.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/numbers.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/predicates.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/resolver-callback-interface-cross-realm.tentative.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/resolver-callback-interface.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/resolver-non-string-result.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/text-html-attributes.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/text-html-elements.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/xml_xpath_runner.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/domxpath/xpathevaluatorbase-creatensresolver.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/fetch/images/canvas-remote-read-remote-image-redirect.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
 create mode 100644 tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/refresh/same-document-refresh.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-nav-link-click.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/semantics/forms/the-input-element/input-form-detach-style-crash.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/html/webappapis/update-rendering/child-document-raf-order.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/referrer-policy/generic/iframe-src-change.html.ini
 create mode 100644 tests/wpt/meta-legacy-layout/workers/constructors/Worker/Worker-constructor.html.ini
 delete mode 100644 tests/wpt/meta-legacy-layout/xhr/open-url-multi-window-5.htm.ini
 rename tests/wpt/{meta-legacy-layout/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html.ini => meta/FileAPI/BlobURL/cross-partition-navigation.https.html.ini} (69%)
 delete mode 100644 tests/wpt/meta/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html.ini
 rename tests/wpt/{meta-legacy-layout/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html.ini => meta/FileAPI/BlobURL/cross-partition-worker-creation.https.html.ini} (79%)
 delete mode 100644 tests/wpt/meta/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html.ini
 rename tests/wpt/{meta-legacy-layout/FileAPI/BlobURL/cross-partition.tentative.https.html.ini => meta/FileAPI/BlobURL/cross-partition.https.html.ini} (95%)
 delete mode 100644 tests/wpt/meta/FileAPI/BlobURL/cross-partition.tentative.https.html.ini
 delete mode 100644 tests/wpt/meta/css/css-conditional/container-queries/container-for-cue.html.ini
 create mode 100644 tests/wpt/meta/css/css-conditional/container-queries/container-units-auto.html.ini
 create mode 100644 tests/wpt/meta/css/css-conditional/container-queries/size-container-auto-height.html.ini
 create mode 100644 tests/wpt/meta/css/css-flexbox/aspect-ratio-intrinsic-size-010.html.ini
 create mode 100644 tests/wpt/meta/css/css-flexbox/flexbox-flex-wrap-flexing-003.html.ini
 create mode 100644 tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-style-valid.html.ini
 create mode 100644 tests/wpt/meta/css/css-grid/grid-definition/flex-item-grid-container-auto-repeat-002.html.ini
 delete mode 100644 tests/wpt/meta/css/css-grid/parsing/grid-template-shorthand-composition.html.ini
 create mode 100644 tests/wpt/meta/css/css-masonry/tentative/parsing/masonry-fill-computed.html.ini
 create mode 100644 tests/wpt/meta/css/css-masonry/tentative/parsing/masonry-fill-valid.html.ini
 create mode 100644 tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-cascade-010.html.ini
 rename tests/wpt/meta/css/css-sizing/stretch/{block-height-1.html.ini => block-height-001.html.ini} (94%)
 create mode 100644 tests/wpt/meta/css/css-sizing/stretch/block-height-002.tentative.html.ini
 create mode 100644 tests/wpt/meta/css/css-sizing/stretch/block-height-003.tentative.html.ini
 create mode 100644 tests/wpt/meta/css/css-sizing/stretch/block-height-004.tentative.html.ini
 create mode 100644 tests/wpt/meta/css/css-sizing/stretch/block-height-005.tentative.html.ini
 create mode 100644 tests/wpt/meta/css/css-sizing/stretch/block-height-006.tentative.html.ini
 delete mode 100644 tests/wpt/meta/css/css-sizing/stretch/block-height-2.html.ini
 create mode 100644 tests/wpt/meta/css/css-sizing/stretch/content-contribution-001.html.ini
 create mode 100644 tests/wpt/meta/css/css-values/vh_not_refreshing_on_chrome.html.ini
 create mode 100644 tests/wpt/meta/css/cssom-view/MediaQueryList-extends-EventTarget-interop.html.ini
 create mode 100644 tests/wpt/meta/css/cssom-view/MediaQueryList-extends-EventTarget.html.ini
 create mode 100644 tests/wpt/meta/css/cssom-view/MediaQueryListEvent.html.ini
 create mode 100644 tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-importNode.tentative.html.ini
 create mode 100644 tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-innerHTML.tentative.html.ini
 create mode 100644 tests/wpt/meta/fullscreen/crashtests/chrome-1312699.html.ini
 create mode 100644 tests/wpt/meta/fullscreen/crashtests/content-visibility-crash.html.ini
 create mode 100644 tests/wpt/meta/fullscreen/rendering/backdrop-iframe.html.ini
 create mode 100644 tests/wpt/meta/fullscreen/rendering/backdrop-inherit.html.ini
 create mode 100644 tests/wpt/meta/fullscreen/rendering/backdrop-object.html.ini
 create mode 100644 tests/wpt/meta/fullscreen/rendering/fullscreen-root-fills-page.html.ini
 create mode 100644 tests/wpt/meta/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1.html.ini
 create mode 100644 tests/wpt/meta/html/browsers/windows/auxiliary-browsing-contexts/named-lookup-scoped-to-browsing-context-group.html.ini
 create mode 100644 tests/wpt/meta/html/browsers/windows/auxiliary-browsing-contexts/no-proactive-swap-when-other-contexts-in-group.html.ini
 delete mode 100644 tests/wpt/meta/html/canvas/element/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/canvas/element/text/2d.text.measure.caret-position-edges.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/canvas/element/text/2d.text.measure.caret-position.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/text/2d.text.measure.index-from-offset-edge-cases.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/text/2d.text.measure.index-from-offset-edges.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/text/2d.text.measure.index-from-offset.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/element/text/2d.text.measure.text-clusters-rendering-options.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.js.ini
 delete mode 100644 tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.html.ini
 delete mode 100644 tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.worker.js.ini
 delete mode 100644 tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.worker.js.ini
 create mode 100644 tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edges.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edges.tentative.worker.js.ini
 create mode 100644 tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.worker.js.ini
 delete mode 100644 tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-reload-location-reload.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-button-element/button-click-submits-with-commandfor.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/border-rendering.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/native-popup-with-wrapper-div.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/picker-and-slotted.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-active.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-custom-button.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-dark-mode.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-default-button.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-disabled-option.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-scroller.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-scroller.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-scroller.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-scroller.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-font-inheriting.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-hover.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend-and-label.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-rendering.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-option-with-label.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-picker-select-border.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-switching-invalidation.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-lr.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-rl.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-wrong-picker-argument.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-explicit-size.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-font-size.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-icon-color.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-only-button-opt-in.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-only-picker-opt-in.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-open-invalidation.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-option-images.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-popover-exit-animation.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-second-child-button.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-selected-value-behavior.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-text-only.tentative.html.ini
 create mode 100644 tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/rel-opener-prevents-browsing-context-group-change.tentative.html.ini
 delete mode 100644 tests/wpt/meta/resource-timing/nested-context-navigations-iframe.html.ini
 create mode 100644 tests/wpt/meta/wasm/jsapi/jspi/notraps.any.js.ini
 create mode 100644 tests/wpt/meta/webidl/ecmascript-binding/es-exceptions/DOMException-is-error.any.js.ini
 delete mode 100644 tests/wpt/meta/workers/WorkerGlobalScope-close.html.ini
 create mode 100644 tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini
 rename tests/wpt/tests/FileAPI/BlobURL/{cross-partition-navigation.tentative.https.html => cross-partition-navigation.https.html} (100%)
 rename tests/wpt/tests/FileAPI/BlobURL/{cross-partition-worker-creation.tentative.https.html => cross-partition-worker-creation.https.html} (100%)
 rename tests/wpt/tests/FileAPI/BlobURL/{cross-partition.tentative.https.html => cross-partition.https.html} (100%)
 create mode 100644 tests/wpt/tests/IndexedDB/fire-error-event-exception.any.js
 delete mode 100644 tests/wpt/tests/IndexedDB/fire-error-event-exception.html
 rename tests/wpt/tests/IndexedDB/{fire-success-event-exception.html => fire-success-event-exception.any.js} (58%)
 rename tests/wpt/tests/IndexedDB/{fire-upgradeneeded-event-exception.html => fire-upgradeneeded-event-exception.any.js} (74%)
 create mode 100644 tests/wpt/tests/compat/webkit-box-align-001.html
 create mode 100644 tests/wpt/tests/content-security-policy/securitypolicyviolation/linenumber.tentative.html
 create mode 100644 tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-007.html
 create mode 100644 tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-008.html
 create mode 100644 tests/wpt/tests/css/css-conditional/container-queries/container-units-auto.html
 create mode 100644 tests/wpt/tests/css/css-conditional/container-queries/size-container-auto-height.html
 create mode 100644 tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-010.html
 create mode 100644 tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-flexing-002.html
 create mode 100644 tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-flexing-003.html
 create mode 100644 tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-invalid.html
 create mode 100644 tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-valid.html
 create mode 100644 tests/wpt/tests/css/css-grid/grid-definition/flex-item-grid-container-auto-repeat-001.html
 create mode 100644 tests/wpt/tests/css/css-grid/grid-definition/flex-item-grid-container-auto-repeat-002.html
 create mode 100644 tests/wpt/tests/css/css-images/gradient/gradient-single-stop-longer-hue-hsl-002-ref.html
 create mode 100644 tests/wpt/tests/css/css-images/gradient/gradient-single-stop-longer-hue-hsl-002.html
 create mode 100644 tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-fill-computed.html
 create mode 100644 tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-fill-invalid.html
 create mode 100644 tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-fill-valid.html
 create mode 100644 tests/wpt/tests/css/css-nesting/set-selector-text.html
 create mode 100644 tests/wpt/tests/css/css-overflow/add-scroller-then-scroll-content-into-view.html
 create mode 100644 tests/wpt/tests/css/css-overflow/content-change-then-scroll-into-view.html
 create mode 100644 tests/wpt/tests/css/css-overflow/line-clamp/webkit-line-clamp-abspos-001.html
 create mode 100644 tests/wpt/tests/css/css-pseudo/highlight-cascade/highlight-cascade-010.html
 create mode 100644 tests/wpt/tests/css/css-rhythm/computedstyle/block-level-replaced-elements-affected-by-block-step-size.html
 create mode 100644 tests/wpt/tests/css/css-rhythm/computedstyle/inline-level-replaced-elements-not-affected-by-block-step-size.html
 create mode 100644 tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-canvas-margins-affected-by-block-step-size.html
 create mode 100644 tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-embed-margins-affected-by-block-step-size.html
 create mode 100644 tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-iframe-margins-affected-by-block-step-size.html
 create mode 100644 tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-img-margins-affected-by-block-step-size.html
 create mode 100644 tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-object-margins-affected-by-block-step-size.html
 create mode 100644 tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-svg-margins-affected-by-block-step-size.html
 create mode 100644 tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-video-margins-affected-by-block-step-size.html
 create mode 100644 tests/wpt/tests/css/css-ruby/ruby-body-element-crash.html
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target-aligns-with-snap-align.tentative.html => scroll-initial-target/scroll-initial-target-aligns-with-snap-align.tentative.html} (91%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target-display-toggled.tentative.html => scroll-initial-target/scroll-initial-target-display-toggled.tentative.html} (88%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target-nested-container.tentative.html => scroll-initial-target/scroll-initial-target-nested-container.tentative.html} (82%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target-root.tentative.html => scroll-initial-target/scroll-initial-target-root.tentative.html} (83%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target-rtl.tentative.html => scroll-initial-target/scroll-initial-target-rtl.tentative.html} (78%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target-span.tentative.html => scroll-initial-target/scroll-initial-target-span.tentative.html} (80%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target-with-anchor-navigation-inner-frame.html => scroll-initial-target/scroll-initial-target-with-anchor-navigation-inner-frame.html} (94%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target-with-anchor-navigation.tentative.html => scroll-initial-target/scroll-initial-target-with-anchor-navigation.tentative.html} (81%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target-with-hash-fragment-navigation-inner-frame.html => scroll-initial-target/scroll-initial-target-with-hash-fragment-navigation-inner-frame.html} (95%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target-with-hash-fragment-navigation.tentative.html => scroll-initial-target/scroll-initial-target-with-hash-fragment-navigation.tentative.html} (70%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target-with-scroll-snap.tentative.html => scroll-initial-target/scroll-initial-target-with-scroll-snap.tentative.html} (87%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target-with-scroll-start-root.tentative.html => scroll-initial-target/scroll-initial-target-with-scroll-start-root.tentative.html} (83%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target-with-scroll-start.tentative.html => scroll-initial-target/scroll-initial-target-with-scroll-start.tentative.html} (82%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target-with-text-fragment-navigation-target.html => scroll-initial-target/scroll-initial-target-with-text-fragment-navigation-target.html} (93%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target-with-text-fragment-navigation.tentative.html => scroll-initial-target/scroll-initial-target-with-text-fragment-navigation.tentative.html} (77%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target-with-user-programmatic-scroll.tentative.html => scroll-initial-target/scroll-initial-target-with-user-programmatic-scroll.tentative.html} (80%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target/scroll-start-target.tentative.html => scroll-initial-target/scroll-initial-target.tentative.html} (85%)
 rename tests/wpt/tests/css/css-scroll-snap-2/{scroll-start-target => scroll-initial-target}/stash.py (68%)
 create mode 100644 tests/wpt/tests/css/css-sizing/abspos-auto-sizing-fit-content-percentage-001.html
 create mode 100644 tests/wpt/tests/css/css-sizing/abspos-auto-sizing-fit-content-percentage-002.html
 create mode 100644 tests/wpt/tests/css/css-sizing/abspos-auto-sizing-fit-content-percentage-003.html
 create mode 100644 tests/wpt/tests/css/css-sizing/abspos-auto-sizing-fit-content-percentage-004.html
 rename tests/wpt/tests/css/css-sizing/stretch/{block-height-1.html => block-height-001.html} (100%)
 create mode 100644 tests/wpt/tests/css/css-sizing/stretch/block-height-002.tentative.html
 create mode 100644 tests/wpt/tests/css/css-sizing/stretch/block-height-003-ref.html
 create mode 100644 tests/wpt/tests/css/css-sizing/stretch/block-height-003.tentative.html
 create mode 100644 tests/wpt/tests/css/css-sizing/stretch/block-height-004.tentative.html
 create mode 100644 tests/wpt/tests/css/css-sizing/stretch/block-height-005.tentative.html
 create mode 100644 tests/wpt/tests/css/css-sizing/stretch/block-height-006.tentative.html
 delete mode 100644 tests/wpt/tests/css/css-sizing/stretch/block-height-2.html
 create mode 100644 tests/wpt/tests/css/css-sizing/stretch/content-contribution-001.html
 create mode 100644 tests/wpt/tests/css/css-view-transitions/empty-render-target-crash.html
 create mode 100644 tests/wpt/tests/css/cssom-view/scrollWidthHeight-overflow-visible-margin-collapsing.html
 create mode 100644 tests/wpt/tests/css/filter-effects/fecolormatrix-negative-ref.html
 create mode 100644 tests/wpt/tests/css/filter-effects/fecolormatrix-negative.html
 create mode 100644 tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-importNode.tentative.html
 create mode 100644 tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-innerHTML.tentative.html
 create mode 100644 tests/wpt/tests/editing/run/delete-chars-following-collapsible-white-space.html
 create mode 100644 tests/wpt/tests/editing/run/delete-to-make-editing-host-empty.html
 create mode 100644 tests/wpt/tests/editing/run/forwarddelete-chars-following-collapsible-white-space.html
 create mode 100644 tests/wpt/tests/fullscreen/crashtests/chrome-1312699.html
 create mode 100644 tests/wpt/tests/fullscreen/crashtests/content-visibility-crash.html
 create mode 100644 tests/wpt/tests/fullscreen/rendering/backdrop-green-ref.html
 create mode 100644 tests/wpt/tests/fullscreen/rendering/backdrop-iframe.html
 create mode 100644 tests/wpt/tests/fullscreen/rendering/backdrop-inherit.html
 create mode 100644 tests/wpt/tests/fullscreen/rendering/backdrop-object-ref.html
 create mode 100644 tests/wpt/tests/fullscreen/rendering/backdrop-object.html
 create mode 100644 tests/wpt/tests/fullscreen/rendering/fullscreen-root-fills-page-ref.html
 create mode 100644 tests/wpt/tests/fullscreen/rendering/fullscreen-root-fills-page.html
 create mode 100644 tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/named-lookup-scoped-to-browsing-context-group.html
 create mode 100644 tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/no-proactive-swap-when-other-contexts-in-group.html
 create mode 100644 tests/wpt/tests/html/browsers/windows/browsing-context-names/duplicate-name-order.html
 delete mode 100644 tests/wpt/tests/html/canvas/element/text/2d.text.measure.caret-position-edge-cases.tentative.html
 create mode 100644 tests/wpt/tests/html/canvas/element/text/2d.text.measure.index-from-offset-edge-cases.tentative.html
 rename tests/wpt/tests/html/canvas/element/text/{2d.text.measure.caret-position-edges.tentative.html => 2d.text.measure.index-from-offset-edges.tentative.html} (88%)
 rename tests/wpt/tests/html/canvas/element/text/{2d.text.measure.caret-position.tentative.html => 2d.text.measure.index-from-offset.tentative.html} (88%)
 create mode 100644 tests/wpt/tests/html/canvas/element/text/2d.text.measure.text-clusters-rendering-options.tentative.html
 delete mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.html
 delete mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.js
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.worker.js
 rename tests/wpt/tests/html/canvas/offscreen/text/{2d.text.measure.caret-position-edges.tentative.html => 2d.text.measure.index-from-offset-edges.tentative.html} (88%)
 rename tests/wpt/tests/html/canvas/offscreen/text/{2d.text.measure.caret-position-edges.tentative.worker.js => 2d.text.measure.index-from-offset-edges.tentative.worker.js} (88%)
 rename tests/wpt/tests/html/canvas/offscreen/text/{2d.text.measure.caret-position.tentative.html => 2d.text.measure.index-from-offset.tentative.html} (88%)
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.html
 create mode 100644 tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.worker.js
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-button-element/button-click-resets-with-commandfor.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-button-element/button-click-submits-with-commandfor.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/border-rendering-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/border-rendering.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/native-popup-with-wrapper-div-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/native-popup-with-wrapper-div.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/picker-and-slotted-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/picker-and-slotted.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/resources/customizable-select-styles.css
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/resources/customizable-select-utils.js
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/resources/fallback-helper.js
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-active-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-active.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-button-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-custom-button.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-dark-mode-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-dark-mode.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-default-button.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-disabled-option-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-disabled-option.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-scroller-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-scroller.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-scroller-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-scroller.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-scroller-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-scroller.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-scroller-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-scroller.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-font-inheriting-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-font-inheriting.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-hover-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-hover.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend-and-label.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-rendering-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-rendering.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-option-with-label.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-picker-select-border-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-picker-select-border.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-switching-invalidation-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-switching-invalidation.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-lr-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-lr.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-rl-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-rl.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-wrong-picker-argument.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-explicit-size-ref.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-explicit-size.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-font-size-ref.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-font-size.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-icon-color-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-icon-color.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-multiple-base-appearance-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-multiple-base-appearance.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-only-button-opt-in.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-only-picker-opt-in-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-only-picker-opt-in.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-open-invalidation-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-open-invalidation.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-option-images-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-option-images.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-popover-exit-animation-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-popover-exit-animation.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-second-child-button-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-second-child-button.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-selected-value-behavior-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-selected-value-behavior.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-text-only-ref.html
 create mode 100644 tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-text-only.tentative.html
 create mode 100644 tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/rel-opener-prevents-browsing-context-group-change.tentative.html
 create mode 100644 tests/wpt/tests/html/syntax/speculative-parsing/expect-no-linked-resources/no-speculative-fetch.tentative.optional.html
 create mode 100644 tests/wpt/tests/html/syntax/speculative-parsing/expect-no-linked-resources/resources/no-speculative-fetch.sub.html
 create mode 100644 tests/wpt/tests/html/syntax/speculative-parsing/expect-no-linked-resources/resources/no-speculative-fetch.sub.html.headers
 create mode 100644 tests/wpt/tests/html/syntax/speculative-parsing/expect-no-linked-resources/resources/stash.py
 create mode 100644 tests/wpt/tests/import-maps/external-import-map-errors.html
 create mode 100644 tests/wpt/tests/infrastructure/crashtests/testdriver.html
 create mode 100644 tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/testdriver-in-ref.html.ini
 create mode 100644 tests/wpt/tests/infrastructure/reftest/testdriver-child.html
 create mode 100644 tests/wpt/tests/infrastructure/reftest/testdriver-iframe.sub.html
 create mode 100644 tests/wpt/tests/infrastructure/reftest/testdriver-in-ref.html
 create mode 100644 tests/wpt/tests/infrastructure/reftest/testdriver-print.html
 create mode 100644 tests/wpt/tests/infrastructure/reftest/testdriver.html
 create mode 100644 tests/wpt/tests/input-events/input-events-range-exceptions.tentative.html
 create mode 100644 tests/wpt/tests/long-animation-frame/tentative/loaf-paint-mixin.html
 create mode 100644 tests/wpt/tests/pointerevents/pointerevent_click_on_chorded_mouse_button.tentative.html
 create mode 100644 tests/wpt/tests/scroll-animations/css/animation-range-scroll-timeline.html
 create mode 100644 tests/wpt/tests/scroll-animations/css/siblings-with-anonymous-timelines.html
 create mode 100644 tests/wpt/tests/storage-access-api/resources/handle-headers-non-retry.py
 create mode 100644 tests/wpt/tests/storage-access-api/resources/handle-headers-retry.py
 create mode 100644 tests/wpt/tests/storage-access-api/resources/header-helpers.py
 create mode 100644 tests/wpt/tests/storage-access-api/resources/nested-handle-storage-access-headers.py
 create mode 100644 tests/wpt/tests/storage-access-api/resources/retrieve-storage-access-headers.py
 create mode 100644 tests/wpt/tests/storage-access-api/storage-access-headers.tentative.https.sub.window.js
 create mode 100644 tests/wpt/tests/svg/types/SVGElement.ownerSVGElement-01.html
 create mode 100644 tests/wpt/tests/svg/types/SVGElement.ownerSVGElement-02.html
 create mode 100644 tests/wpt/tests/svg/types/helper-SVGElement.ownerSVGElement-02.svg
 create mode 100644 tests/wpt/tests/tools/wptrunner/wptrunner/executors/message-queue.js
 create mode 100644 tests/wpt/tests/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-TT-realm.html
 rename tests/wpt/tests/trusted-types/{Element-setAttribute-respects-Elements-node-documents-globals-CSP.html => Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-non-TT-realm.html} (89%)
 create mode 100644 tests/wpt/tests/trusted-types/eval-function-constructor-untrusted-arguments-and-default-policy-throwing.html
 create mode 100644 tests/wpt/tests/wasm/jsapi/jspi/notraps.any.js
 create mode 100644 tests/wpt/tests/webidl/ecmascript-binding/es-exceptions/DOMException-is-error.any.js

diff --git a/tests/wpt/meta-legacy-layout/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/meta-legacy-layout/FileAPI/url/url-in-tags-revoke.window.js.ini
index 35fe4fd6e0d..282ab0b2525 100644
--- a/tests/wpt/meta-legacy-layout/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -14,6 +14,3 @@
 
   [Opening a blob URL in a new window by clicking an <a> tag works immediately before revoking the URL.]
     expected: TIMEOUT
-
-  [Fetching a blob URL immediately before revoking it works in <script> tags.]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-cascade/scope-nesting.html.ini b/tests/wpt/meta-legacy-layout/css/css-cascade/scope-nesting.html.ini
index 6847b207043..34bbf10f158 100644
--- a/tests/wpt/meta-legacy-layout/css/css-cascade/scope-nesting.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-cascade/scope-nesting.html.ini
@@ -61,3 +61,6 @@
 
   [Insert a CSSNestedDeclarations rule directly in top-level @scope]
     expected: FAIL
+
+  [Mutating selectorText on outer style rule causes correct inner specificity]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-fonts/generic-family-keywords-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-fonts/generic-family-keywords-001.html.ini
index a234e1c3b3d..d6909124446 100644
--- a/tests/wpt/meta-legacy-layout/css/css-fonts/generic-family-keywords-001.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-fonts/generic-family-keywords-001.html.ini
@@ -19,6 +19,3 @@
 
   [@font-face matching for quoted and unquoted fangsong]
     expected: FAIL
-
-  [@font-face matching for quoted and unquoted serif]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html.ini
index b102e6ad5c5..01d7cacac97 100644
--- a/tests/wpt/meta-legacy-layout/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html.ini
@@ -25,3 +25,39 @@
 
   [Property column-rule-style value 'inset']
     expected: FAIL
+
+  [Property column-rule-style value 'dotted dashed solid']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(10, double)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(3, groove) repeat(4, ridge)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(auto, solid)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(auto, dotted solid inset)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(4, none ridge solid) repeat(auto, hidden)']
+    expected: FAIL
+
+  [Property column-rule-style value 'inset repeat(auto, solid ridge) repeat(4, none groove hidden)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(calc(5 + 3), ridge)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(4, dotted double dashed) repeat(auto, solid) ridge']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(4, dotted double dashed) repeat(auto, solid) repeat(4, none groove hidden)']
+    expected: FAIL
+
+  [Property column-rule-style value 'ridge repeat(auto, solid)']
+    expected: FAIL
+
+  [Property column-rule-style value 'ridge repeat(auto, solid) ridge']
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-pseudo/parsing/the-check-pseudo-element.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-pseudo/parsing/the-check-pseudo-element.tentative.html.ini
deleted file mode 100644
index 062a58a6e3f..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-pseudo/parsing/the-check-pseudo-element.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[the-check-pseudo-element.tentative.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-pseudo/parsing/the-select-arrow-pseudo-element.tentative.html.ini b/tests/wpt/meta-legacy-layout/css/css-pseudo/parsing/the-select-arrow-pseudo-element.tentative.html.ini
deleted file mode 100644
index a4c4197b59b..00000000000
--- a/tests/wpt/meta-legacy-layout/css/css-pseudo/parsing/the-select-arrow-pseudo-element.tentative.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[the-select-arrow-pseudo-element.tentative.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/keyword-sizes-on-replaced-element.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/keyword-sizes-on-replaced-element.html.ini
index 637706cddb9..079483178a6 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/keyword-sizes-on-replaced-element.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/keyword-sizes-on-replaced-element.html.ini
@@ -103,3 +103,15 @@
 
   [.test 60]
     expected: FAIL
+
+  [.test 62]
+    expected: FAIL
+
+  [.test 63]
+    expected: FAIL
+
+  [.test 65]
+    expected: FAIL
+
+  [.test 66]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/stretch/block-height-1.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/stretch/block-height-1.html.ini
index 51f953f5c6a..5c9d7ecf7ea 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/stretch/block-height-1.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/stretch/block-height-1.html.ini
@@ -1,27 +1,2 @@
 [block-height-1.html]
-  [[data-expected-height\] 1]
-    expected: FAIL
-
-  [[data-expected-height\] 2]
-    expected: FAIL
-
-  [[data-expected-height\] 3]
-    expected: FAIL
-
-  [[data-expected-height\] 7]
-    expected: FAIL
-
-  [[data-expected-height\] 8]
-    expected: FAIL
-
-  [[data-expected-height\] 9]
-    expected: FAIL
-
-  [[data-expected-height\] 13]
-    expected: FAIL
-
-  [[data-expected-height\] 14]
-    expected: FAIL
-
-  [[data-expected-height\] 15]
-    expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-sizing/stretch/block-height-2.html.ini b/tests/wpt/meta-legacy-layout/css/css-sizing/stretch/block-height-2.html.ini
index 9b6449c79e3..8e53e770c55 100644
--- a/tests/wpt/meta-legacy-layout/css/css-sizing/stretch/block-height-2.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-sizing/stretch/block-height-2.html.ini
@@ -1,6 +1,2 @@
 [block-height-2.html]
-  [[data-expected-height\] 1]
-    expected: FAIL
-
-  [[data-expected-height\] 2]
-    expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/css-values/vh_not_refreshing_on_chrome.html.ini b/tests/wpt/meta-legacy-layout/css/css-values/vh_not_refreshing_on_chrome.html.ini
index 599b3e07f8d..6c46d48c239 100644
--- a/tests/wpt/meta-legacy-layout/css/css-values/vh_not_refreshing_on_chrome.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/css-values/vh_not_refreshing_on_chrome.html.ini
@@ -1,2 +1,3 @@
 [vh_not_refreshing_on_chrome.html]
   bug: https://github.com/servo/servo/issues/8984
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini b/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini
index 037d7e0f951..c124d4bb540 100644
--- a/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini
@@ -4,3 +4,12 @@
 
   [throws if handleEvent is thruthy and not callable]
     expected: FAIL
+
+  [looks up handleEvent method on every event dispatch]
+    expected: FAIL
+
+  [doesn't look up handleEvent method on callable event listeners]
+    expected: FAIL
+
+  [rethrows errors when getting handleEvent]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini b/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
index d52a3e77a70..7e55b5e346e 100644
--- a/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
@@ -4,3 +4,15 @@
 
   [listeners are called correct number of times]
     expected: FAIL
+
+  [listeners are called in order they were added]
+    expected: FAIL
+
+  [listener that was added twice is called only once]
+    expected: FAIL
+
+  [listeners are called in order their MQLs were created]
+    expected: FAIL
+
+  [removing listener from one MQL doesn't remove it from all MQLs]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryList-extends-EventTarget-interop.html.ini b/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryList-extends-EventTarget-interop.html.ini
index 758c26f2a2d..90af9302041 100644
--- a/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryList-extends-EventTarget-interop.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryList-extends-EventTarget-interop.html.ini
@@ -1,3 +1,15 @@
 [MediaQueryList-extends-EventTarget-interop.html]
   [listeners are called in order they were added, ignoring capture parameter]
     expected: FAIL
+
+  [listener added with addListener and addEventListener (capture) is called twice]
+    expected: FAIL
+
+  [removeEventListener (capture) doesn't remove listener added with addListener]
+    expected: FAIL
+
+  [removeListener doesn't remove listener added with addEventListener (capture)]
+    expected: FAIL
+
+  [capturing event listener fires before non-capturing listener at target]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryList-extends-EventTarget.html.ini b/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryList-extends-EventTarget.html.ini
new file mode 100644
index 00000000000..bfd64f1c58d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryList-extends-EventTarget.html.ini
@@ -0,0 +1,9 @@
+[MediaQueryList-extends-EventTarget.html]
+  [onchange removes listener]
+    expected: FAIL
+
+  [listeners for "change" type are called]
+    expected: FAIL
+
+  [addEventListener "once" option is respected]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryListEvent.html.ini b/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryListEvent.html.ini
new file mode 100644
index 00000000000..2bff632780a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/css/cssom-view/MediaQueryListEvent.html.ini
@@ -0,0 +1,6 @@
+[MediaQueryListEvent.html]
+  [argument of onchange]
+    expected: FAIL
+
+  [constructor of "change" event]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/cssom-view/scrollWidthHeight-negative-margin-002.html.ini b/tests/wpt/meta-legacy-layout/css/cssom-view/scrollWidthHeight-negative-margin-002.html.ini
index b159d372838..9dead3c969c 100644
--- a/tests/wpt/meta-legacy-layout/css/cssom-view/scrollWidthHeight-negative-margin-002.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/cssom-view/scrollWidthHeight-negative-margin-002.html.ini
@@ -431,3 +431,51 @@
 
   [scrollHeight with negative margins: display: flex; overflow: scroll; direction: rtl; flex-flow: column-reverse wrap-reverse;]
     expected: FAIL
+
+  [scrollWidth with negative margins: display: flow-root; overflow: visible; direction: ltr; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: flow-root; overflow: visible; direction: ltr; flex-direction: row;]
+    expected: FAIL
+
+  [scrollWidth with negative margins: display: flow-root; overflow: hidden; direction: ltr; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: flow-root; overflow: hidden; direction: ltr; flex-direction: row;]
+    expected: FAIL
+
+  [scrollWidth with negative margins: display: flow-root; overflow: auto; direction: ltr; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: flow-root; overflow: auto; direction: ltr; flex-direction: row;]
+    expected: FAIL
+
+  [scrollWidth with negative margins: display: flow-root; overflow: scroll; direction: ltr; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: flow-root; overflow: scroll; direction: ltr; flex-direction: row;]
+    expected: FAIL
+
+  [scrollWidth with negative margins: display: flow-root; overflow: visible; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: flow-root; overflow: visible; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollWidth with negative margins: display: flow-root; overflow: hidden; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: flow-root; overflow: hidden; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollWidth with negative margins: display: flow-root; overflow: auto; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: flow-root; overflow: auto; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollWidth with negative margins: display: flow-root; overflow: scroll; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: flow-root; overflow: scroll; direction: rtl; flex-direction: row;]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht.ini b/tests/wpt/meta-legacy-layout/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht.ini
index 90fe9e3649e..df162554252 100644
--- a/tests/wpt/meta-legacy-layout/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht.ini
+++ b/tests/wpt/meta-legacy-layout/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht.ini
@@ -4,3 +4,6 @@
 
   [elemOverflow.scrollHeight is the width of its scrolled contents (plus padding)]
     expected: FAIL
+
+  [elemOverflow.scrollHeight is the height of its scrolled contents (plus padding, since we overflowed)]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/cssom/serialize-values.html.ini b/tests/wpt/meta-legacy-layout/css/cssom/serialize-values.html.ini
index ad00a11fc8d..a223924aca0 100644
--- a/tests/wpt/meta-legacy-layout/css/cssom/serialize-values.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/cssom/serialize-values.html.ini
@@ -82,3 +82,6 @@
 
   [widows: inherit]
     expected: FAIL
+
+  [content: attr(foo, "")]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/css/cssom/stylesheet-same-origin.sub.html.ini b/tests/wpt/meta-legacy-layout/css/cssom/stylesheet-same-origin.sub.html.ini
index e4e933e9fbf..6a3026f73da 100644
--- a/tests/wpt/meta-legacy-layout/css/cssom/stylesheet-same-origin.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/css/cssom/stylesheet-same-origin.sub.html.ini
@@ -1,7 +1,3 @@
 [stylesheet-same-origin.sub.html]
-  [Origin-clean check in cross-origin CSSOM Stylesheets (redirect from cross-origin to same-origin)]
-    expected: FAIL
-
   [Origin-clean check in loading error CSSOM Stylesheets]
     expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/dom/idlharness.window.js.ini b/tests/wpt/meta-legacy-layout/dom/idlharness.window.js.ini
index e9c87cf36c0..4ec5cc726fe 100644
--- a/tests/wpt/meta-legacy-layout/dom/idlharness.window.js.ini
+++ b/tests/wpt/meta-legacy-layout/dom/idlharness.window.js.ini
@@ -218,15 +218,9 @@
   [XPathExpression interface: existence and properties of interface object]
     expected: FAIL
 
-  [Document interface: operation createNSResolver(Node)]
-    expected: FAIL
-
   [XPathResult interface: document.evaluate("//*", document.body) must inherit property "BOOLEAN_TYPE" with the proper type]
     expected: FAIL
 
-  [XPathEvaluator interface: existence and properties of interface prototype object's @@unscopables property]
-    expected: FAIL
-
   [XPathResult interface: constant NUMBER_TYPE on interface object]
     expected: FAIL
 
@@ -263,9 +257,6 @@
   [XPathExpression interface: calling evaluate(Node, unsigned short, XPathResult) on document.createExpression("//*") with too few arguments must throw TypeError]
     expected: FAIL
 
-  [Document interface: xmlDoc must inherit property "createNSResolver(Node)" with the proper type]
-    expected: FAIL
-
   [XPathResult interface: document.evaluate("//*", document.body) must inherit property "ORDERED_NODE_ITERATOR_TYPE" with the proper type]
     expected: FAIL
 
@@ -281,9 +272,6 @@
   [Document interface: operation evaluate(DOMString, Node, XPathNSResolver, unsigned short, XPathResult)]
     expected: FAIL
 
-  [XPathEvaluator interface: operation createNSResolver(Node)]
-    expected: FAIL
-
   [Stringification of document.evaluate("//*", document.body)]
     expected: FAIL
 
@@ -299,15 +287,9 @@
   [XPathResult interface: existence and properties of interface object]
     expected: FAIL
 
-  [XPathEvaluator interface: existence and properties of interface prototype object's "constructor" property]
-    expected: FAIL
-
   [XPathExpression interface: existence and properties of interface prototype object]
     expected: FAIL
 
-  [XPathEvaluator interface: existence and properties of interface object]
-    expected: FAIL
-
   [XPathResult interface: calling snapshotItem(unsigned long) on document.evaluate("//*", document.body) with too few arguments must throw TypeError]
     expected: FAIL
 
@@ -317,9 +299,6 @@
   [XPathEvaluator interface: new XPathEvaluator() must inherit property "createExpression(DOMString, XPathNSResolver)" with the proper type]
     expected: FAIL
 
-  [Document interface: calling createNSResolver(Node) on new Document() with too few arguments must throw TypeError]
-    expected: FAIL
-
   [XPathResult interface: constant ORDERED_NODE_ITERATOR_TYPE on interface prototype object]
     expected: FAIL
 
@@ -371,9 +350,6 @@
   [XPathResult interface: document.evaluate("//*", document.body) must inherit property "ANY_TYPE" with the proper type]
     expected: FAIL
 
-  [Document interface: new Document() must inherit property "createNSResolver(Node)" with the proper type]
-    expected: FAIL
-
   [XPathResult interface: attribute stringValue]
     expected: FAIL
 
@@ -386,9 +362,6 @@
   [XPathResult interface: document.evaluate("//*", document.body) must inherit property "UNORDERED_NODE_SNAPSHOT_TYPE" with the proper type]
     expected: FAIL
 
-  [Document interface: calling createNSResolver(Node) on xmlDoc with too few arguments must throw TypeError]
-    expected: FAIL
-
   [XPathResult interface: document.evaluate("//*", document.body) must inherit property "booleanValue" with the proper type]
     expected: FAIL
 
@@ -404,9 +377,6 @@
   [XPathResult interface: attribute snapshotLength]
     expected: FAIL
 
-  [XPathEvaluator interface object length]
-    expected: FAIL
-
   [XPathResult interface: document.evaluate("//*", document.body) must inherit property "STRING_TYPE" with the proper type]
     expected: FAIL
 
@@ -440,9 +410,6 @@
   [XPathResult interface: document.evaluate("//*", document.body) must inherit property "NUMBER_TYPE" with the proper type]
     expected: FAIL
 
-  [XPathEvaluator interface object name]
-    expected: FAIL
-
   [XPathResult interface: document.evaluate("//*", document.body) must inherit property "ORDERED_NODE_SNAPSHOT_TYPE" with the proper type]
     expected: FAIL
 
@@ -452,9 +419,6 @@
   [XPathExpression interface object length]
     expected: FAIL
 
-  [Stringification of new XPathEvaluator()]
-    expected: FAIL
-
   [XPathResult interface: constant ORDERED_NODE_SNAPSHOT_TYPE on interface object]
     expected: FAIL
 
@@ -476,15 +440,9 @@
   [Document interface: calling evaluate(DOMString, Node, XPathNSResolver, unsigned short, XPathResult) on xmlDoc with too few arguments must throw TypeError]
     expected: FAIL
 
-  [XPathEvaluator must be primary interface of new XPathEvaluator()]
-    expected: FAIL
-
   [XPathResult interface: operation iterateNext()]
     expected: FAIL
 
-  [XPathEvaluator interface: new XPathEvaluator() must inherit property "createNSResolver(Node)" with the proper type]
-    expected: FAIL
-
   [XPathResult interface: document.evaluate("//*", document.body) must inherit property "iterateNext()" with the proper type]
     expected: FAIL
 
@@ -500,18 +458,12 @@
   [XPathResult interface: constant STRING_TYPE on interface prototype object]
     expected: FAIL
 
-  [XPathEvaluator interface: calling createNSResolver(Node) on new XPathEvaluator() with too few arguments must throw TypeError]
-    expected: FAIL
-
   [XPathResult interface: document.evaluate("//*", document.body) must inherit property "FIRST_ORDERED_NODE_TYPE" with the proper type]
     expected: FAIL
 
   [XPathExpression interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
-  [XPathEvaluator interface: existence and properties of interface prototype object]
-    expected: FAIL
-
   [ShadowRoot interface: attribute onslotchange]
     expected: FAIL
 
@@ -779,9 +731,6 @@
   [AbortSignal interface: new AbortController().signal must inherit property "throwIfAborted()" with the proper type]
     expected: FAIL
 
-  [idl_test setup]
-    expected: FAIL
-
   [AbortSignal interface: operation timeout(unsigned long long)]
     expected: FAIL
 
@@ -883,5 +832,3 @@
 
 
 [idlharness.window.html?include=Node]
-  [idl_test setup]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/dom/nodes/moveBefore/tentative/Node-moveBefore.html.ini b/tests/wpt/meta-legacy-layout/dom/nodes/moveBefore/tentative/Node-moveBefore.html.ini
index b05b39d77ea..5abd05c160d 100644
--- a/tests/wpt/meta-legacy-layout/dom/nodes/moveBefore/tentative/Node-moveBefore.html.ini
+++ b/tests/wpt/meta-legacy-layout/dom/nodes/moveBefore/tentative/Node-moveBefore.html.ini
@@ -142,3 +142,15 @@
 
   [No custom element callbacks are run during disconnected moveBefore()]
     expected: FAIL
+
+  [moveBefore() CharacterData into a Document]
+    expected: FAIL
+
+  [Moving a node from a disconnected container to a disconnected new parent without a shared ancestor throws a HIERARCHY_REQUEST_ERR]
+    expected: FAIL
+
+  [Moving a node from a disconnected container to a disconnected new parent in the same tree succeeds]
+    expected: FAIL
+
+  [Moving a node from a disconnected container to a disconnected new parent in the same tree succeeds,also across shadow-roots]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/dom/observable/tentative/observable-reduce.any.js.ini b/tests/wpt/meta-legacy-layout/dom/observable/tentative/observable-reduce.any.js.ini
index e53abcaaaba..3b62618029f 100644
--- a/tests/wpt/meta-legacy-layout/dom/observable/tentative/observable-reduce.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/dom/observable/tentative/observable-reduce.any.js.ini
@@ -20,6 +20,9 @@
   [reduce(): Reject with an AbortError if the subscription is aborted before the source completes]
     expected: FAIL
 
+  [reduce(): Reduces the values for different objects]
+    expected: FAIL
+
 
 [observable-reduce.any.html]
   [reduce(): Reduces the values of the Observable, starting with the initial seed value]
@@ -42,3 +45,6 @@
 
   [reduce(): Reject with an AbortError if the subscription is aborted before the source completes]
     expected: FAIL
+
+  [reduce(): Reduces the values for different objects]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/booleans.html.ini b/tests/wpt/meta-legacy-layout/domxpath/booleans.html.ini
new file mode 100644
index 00000000000..81016931bcb
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/booleans.html.ini
@@ -0,0 +1,21 @@
+[booleans.html]
+  ["or" operator depending on the context node]
+    expected: FAIL
+
+  ["=" operator depending on the context node]
+    expected: FAIL
+
+  ["!=" operator depending on the context node]
+    expected: FAIL
+
+  ["<" operator depending on the context node]
+    expected: FAIL
+
+  [">" operator depending on the context node]
+    expected: FAIL
+
+  [">=" operator depending on the context node]
+    expected: FAIL
+
+  ["<=" operator depending on the context node]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/document.tentative.html.ini b/tests/wpt/meta-legacy-layout/domxpath/document.tentative.html.ini
new file mode 100644
index 00000000000..32710026d6e
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/document.tentative.html.ini
@@ -0,0 +1,3 @@
+[document.tentative.html]
+  [XPath parent of documentElement]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/evaluator-constructor.html.ini b/tests/wpt/meta-legacy-layout/domxpath/evaluator-constructor.html.ini
new file mode 100644
index 00000000000..711480d74d3
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/evaluator-constructor.html.ini
@@ -0,0 +1,3 @@
+[evaluator-constructor.html]
+  [Constructor with 'new']
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/evaluator-cross-realm.tentative.html.ini b/tests/wpt/meta-legacy-layout/domxpath/evaluator-cross-realm.tentative.html.ini
new file mode 100644
index 00000000000..53d6394ab58
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/evaluator-cross-realm.tentative.html.ini
@@ -0,0 +1,12 @@
+[evaluator-cross-realm.tentative.html]
+  [evaluator from realm with XML associated document, context node in XML document, no namespace resolver]
+    expected: FAIL
+
+  [evaluator from realm with XML associated document, context node in HTML document, no namespace resolver]
+    expected: FAIL
+
+  [evaluator from realm with HTML associated document, context node in XML document, no namespace resolver]
+    expected: FAIL
+
+  [evaluator from realm with HTML associated document, context node in HTML document, no namespace resolver]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/evaluator-different-document.tentative.html.ini b/tests/wpt/meta-legacy-layout/domxpath/evaluator-different-document.tentative.html.ini
new file mode 100644
index 00000000000..57989dec412
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/evaluator-different-document.tentative.html.ini
@@ -0,0 +1,24 @@
+[evaluator-different-document.tentative.html]
+  [evaluate operation on XML document, context node in XML document, no namespace resolver]
+    expected: FAIL
+
+  [evaluate operation on HTML document, context node in HTML document, no namespace resolver]
+    expected: FAIL
+
+  [evaluate operation on XML document, context node in HTML document, no namespace resolver]
+    expected: FAIL
+
+  [evaluate operation on HTML document, context node in XML document, no namespace resolver]
+    expected: FAIL
+
+  [evaluate operation on XML document, context node in XML document, with namespace resolver]
+    expected: FAIL
+
+  [evaluate operation on HTML document, context node in HTML document, with namespace resolver]
+    expected: FAIL
+
+  [evaluate operation on XML document, context node in HTML document, with namespace resolver]
+    expected: FAIL
+
+  [evaluate operation on HTML document, context node in XML document, with namespace resolver]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/expression-cross-realm.tentative.html.ini b/tests/wpt/meta-legacy-layout/domxpath/expression-cross-realm.tentative.html.ini
new file mode 100644
index 00000000000..24d9b7e8582
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/expression-cross-realm.tentative.html.ini
@@ -0,0 +1,12 @@
+[expression-cross-realm.tentative.html]
+  [expression from realm with XML associated document, context node in XML document, no namespace resolver]
+    expected: FAIL
+
+  [expression from realm with XML associated document, context node in HTML document, no namespace resolver]
+    expected: FAIL
+
+  [expression from realm with HTML associated document, context node in XML document, no namespace resolver]
+    expected: FAIL
+
+  [expression from realm with HTML associated document, context node in HTML document, no namespace resolver]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/expression-different-document.tentative.html.ini b/tests/wpt/meta-legacy-layout/domxpath/expression-different-document.tentative.html.ini
new file mode 100644
index 00000000000..46812381c64
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/expression-different-document.tentative.html.ini
@@ -0,0 +1,24 @@
+[expression-different-document.tentative.html]
+  [expression from XML document, context node in XML document, no namespace resolver]
+    expected: FAIL
+
+  [expression from HTML document, context node in HTML document, no namespace resolver]
+    expected: FAIL
+
+  [expression from XML document, context node in HTML document, no namespace resolver]
+    expected: FAIL
+
+  [expression from HTML document, context node in XML document, no namespace resolver]
+    expected: FAIL
+
+  [expression from XML document, context node in XML document, with namespace resolver]
+    expected: FAIL
+
+  [expression from HTML document, context node in HTML document, with namespace resolver]
+    expected: FAIL
+
+  [expression from XML document, context node in HTML document, with namespace resolver]
+    expected: FAIL
+
+  [expression from HTML document, context node in XML document, with namespace resolver]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/fn-concat.html.ini b/tests/wpt/meta-legacy-layout/domxpath/fn-concat.html.ini
new file mode 100644
index 00000000000..c7bf67e01fb
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/fn-concat.html.ini
@@ -0,0 +1,3 @@
+[fn-concat.html]
+  [concat() arguments depending on the context node]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/fn-contains.html.ini b/tests/wpt/meta-legacy-layout/domxpath/fn-contains.html.ini
new file mode 100644
index 00000000000..371cbeb8431
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/fn-contains.html.ini
@@ -0,0 +1,3 @@
+[fn-contains.html]
+  [contains() arguments depending on the context node]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/fn-lang.html.ini b/tests/wpt/meta-legacy-layout/domxpath/fn-lang.html.ini
new file mode 100644
index 00000000000..31754463dcc
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/fn-lang.html.ini
@@ -0,0 +1,21 @@
+[fn-lang.html]
+  [lang("en"): <root><match lang="en"></match></root>]
+    expected: FAIL
+
+  [lang("en"): <root><match lang="EN"></match></root>]
+    expected: FAIL
+
+  [lang("en"): <root><match lang="en-us"></match></root>]
+    expected: FAIL
+
+  [lang("en"): <root><unmatch></unmatch></root>]
+    expected: FAIL
+
+  [lang("ja"): <root lang="ja"><match></match></root>]
+    expected: FAIL
+
+  [lang("ja"): <root lang="ja-jp"><unmatch lang="ja_JP"></unmatch></root>]
+    expected: FAIL
+
+  [lang("ko"): <root><unmatch lang="Ko"></unmatch></root>]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/fn-normalize-space.html.ini b/tests/wpt/meta-legacy-layout/domxpath/fn-normalize-space.html.ini
new file mode 100644
index 00000000000..f253465a915
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/fn-normalize-space.html.ini
@@ -0,0 +1,6 @@
+[fn-normalize-space.html]
+  [normalize-space() without arguments]
+    expected: FAIL
+
+  [normalize-space() should handle only #x20, #x9, #xD, and #xA]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/fn-starts-with.html.ini b/tests/wpt/meta-legacy-layout/domxpath/fn-starts-with.html.ini
new file mode 100644
index 00000000000..0d2c71e00f1
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/fn-starts-with.html.ini
@@ -0,0 +1,3 @@
+[fn-starts-with.html]
+  [starts-with() arguments depending on the context node]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/fn-substring-after.html.ini b/tests/wpt/meta-legacy-layout/domxpath/fn-substring-after.html.ini
new file mode 100644
index 00000000000..d340fdf81ea
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/fn-substring-after.html.ini
@@ -0,0 +1,3 @@
+[fn-substring-after.html]
+  [substring-after() arguments depending on the context node]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/fn-substring-before.html.ini b/tests/wpt/meta-legacy-layout/domxpath/fn-substring-before.html.ini
new file mode 100644
index 00000000000..09c2aee60ee
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/fn-substring-before.html.ini
@@ -0,0 +1,3 @@
+[fn-substring-before.html]
+  [substring-before() arguments depending on the context node]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/fn-substring.html.ini b/tests/wpt/meta-legacy-layout/domxpath/fn-substring.html.ini
new file mode 100644
index 00000000000..32ef0e5f85a
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/fn-substring.html.ini
@@ -0,0 +1,3 @@
+[fn-substring.html]
+  [substring() arguments depending on the context node]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/fn-translate.html.ini b/tests/wpt/meta-legacy-layout/domxpath/fn-translate.html.ini
new file mode 100644
index 00000000000..4eeb0fbd73d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/fn-translate.html.ini
@@ -0,0 +1,3 @@
+[fn-translate.html]
+  [translate() arguments depending on the context node]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/lexical-structure.html.ini b/tests/wpt/meta-legacy-layout/domxpath/lexical-structure.html.ini
new file mode 100644
index 00000000000..200dac9f2ee
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/lexical-structure.html.ini
@@ -0,0 +1,6 @@
+[lexical-structure.html]
+  [Literal: Only ' and " should be handled as literal quotes.]
+    expected: FAIL
+
+  [ExprWhitespace: Only #x20 #x9 #xD or #xA must be handled as a whitespace.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/node-sets.html.ini b/tests/wpt/meta-legacy-layout/domxpath/node-sets.html.ini
new file mode 100644
index 00000000000..856f22dd655
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/node-sets.html.ini
@@ -0,0 +1,3 @@
+[node-sets.html]
+  [| operator should evaluate both sides of expressions with the same context node]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/numbers.html.ini b/tests/wpt/meta-legacy-layout/domxpath/numbers.html.ini
new file mode 100644
index 00000000000..5c150ef467d
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/numbers.html.ini
@@ -0,0 +1,15 @@
+[numbers.html]
+  ["+" operator depending on the context node]
+    expected: FAIL
+
+  ["-" operator depending on the context node]
+    expected: FAIL
+
+  ["*" operator depending on the context node]
+    expected: FAIL
+
+  ["div" operator depending on the context node]
+    expected: FAIL
+
+  ["mod" operator depending on the context node]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/predicates.html.ini b/tests/wpt/meta-legacy-layout/domxpath/predicates.html.ini
new file mode 100644
index 00000000000..1fb6144e7db
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/predicates.html.ini
@@ -0,0 +1,3 @@
+[predicates.html]
+  [An expression in a predicate should not change the context node]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/resolver-callback-interface-cross-realm.tentative.html.ini b/tests/wpt/meta-legacy-layout/domxpath/resolver-callback-interface-cross-realm.tentative.html.ini
new file mode 100644
index 00000000000..d129b32d4a2
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/resolver-callback-interface-cross-realm.tentative.html.ini
@@ -0,0 +1,15 @@
+[resolver-callback-interface-cross-realm.tentative.html]
+  [XPathNSResolver is cross-realm plain object without 'lookupNamespaceURI' property]
+    expected: FAIL
+
+  [XPathNSResolver is cross-realm plain object with non-callable 'lookupNamespaceURI' property]
+    expected: FAIL
+
+  [XPathNSResolver is cross-realm non-callable revoked Proxy]
+    expected: FAIL
+
+  [XPathNSResolver is cross-realm callable revoked Proxy]
+    expected: FAIL
+
+  [XPathNSResolver is cross-realm plain object with revoked Proxy as 'lookupNamespaceURI' property]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/resolver-callback-interface.html.ini b/tests/wpt/meta-legacy-layout/domxpath/resolver-callback-interface.html.ini
new file mode 100644
index 00000000000..0410fd68897
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/resolver-callback-interface.html.ini
@@ -0,0 +1,30 @@
+[resolver-callback-interface.html]
+  [callable resolver]
+    expected: FAIL
+
+  [callable resolver: result is not cached]
+    expected: FAIL
+
+  [callable resolver: abrupt completion from Call]
+    expected: FAIL
+
+  [callable resolver: no 'lookupNamespaceURI' lookups]
+    expected: FAIL
+
+  [object resolver]
+    expected: FAIL
+
+  [object resolver: this value and `prefix` argument]
+    expected: FAIL
+
+  [object resolver: 'lookupNamespaceURI' is not cached]
+    expected: FAIL
+
+  [object resolver: abrupt completion from Get]
+    expected: FAIL
+
+  [object resolver: 'lookupNamespaceURI' is thruthy and not callable]
+    expected: FAIL
+
+  [object resolver: 'lookupNamespaceURI' is falsy and not callable]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/resolver-non-string-result.html.ini b/tests/wpt/meta-legacy-layout/domxpath/resolver-non-string-result.html.ini
new file mode 100644
index 00000000000..bfbdbe956d2
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/resolver-non-string-result.html.ini
@@ -0,0 +1,18 @@
+[resolver-non-string-result.html]
+  [undefined]
+    expected: FAIL
+
+  [null]
+    expected: FAIL
+
+  [number]
+    expected: FAIL
+
+  [boolean]
+    expected: FAIL
+
+  [symbol]
+    expected: FAIL
+
+  [object coercion (abrupt completion)]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/text-html-attributes.html.ini b/tests/wpt/meta-legacy-layout/domxpath/text-html-attributes.html.ini
new file mode 100644
index 00000000000..98a12f1f3b3
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/text-html-attributes.html.ini
@@ -0,0 +1,45 @@
+[text-html-attributes.html]
+  [Select html element based on attribute]
+    expected: FAIL
+
+  [Select html element based on attribute mixed case]
+    expected: FAIL
+
+  [Select both HTML and SVG elements based on attribute]
+    expected: FAIL
+
+  [Select HTML element with non-ascii attribute 1]
+    expected: FAIL
+
+  [Select HTML element with non-ascii attribute 2]
+    expected: FAIL
+
+  [Select HTML element with non-ascii attribute 3]
+    expected: FAIL
+
+  [Select SVG element based on mixed case attribute]
+    expected: FAIL
+
+  [Select both HTML and SVG elements based on mixed case attribute]
+    expected: FAIL
+
+  [Select SVG elements with refX attribute]
+    expected: FAIL
+
+  [Select SVG elements with refX attribute incorrect case]
+    expected: FAIL
+
+  [Select SVG elements with refX attribute lowercase]
+    expected: FAIL
+
+  [Select SVG element with non-ascii attribute 1]
+    expected: FAIL
+
+  [Select SVG element with non-ascii attribute 2]
+    expected: FAIL
+
+  [xmlns attribute]
+    expected: FAIL
+
+  [svg element with XLink attribute]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/text-html-elements.html.ini b/tests/wpt/meta-legacy-layout/domxpath/text-html-elements.html.ini
new file mode 100644
index 00000000000..54cedacaa68
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/text-html-elements.html.ini
@@ -0,0 +1,33 @@
+[text-html-elements.html]
+  [HTML elements no namespace prefix]
+    expected: FAIL
+
+  [HTML elements namespace prefix]
+    expected: FAIL
+
+  [HTML elements mixed use of prefix]
+    expected: FAIL
+
+  [SVG elements no namespace prefix]
+    expected: FAIL
+
+  [SVG elements namespace prefix]
+    expected: FAIL
+
+  [HTML elements mixed case]
+    expected: FAIL
+
+  [SVG elements mixed case selector]
+    expected: FAIL
+
+  [Non-ascii HTML element]
+    expected: FAIL
+
+  [Non-ascii HTML element2]
+    expected: FAIL
+
+  [Non-ascii HTML element3]
+    expected: FAIL
+
+  [Throw with invalid prefix]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/xml_xpath_runner.html.ini b/tests/wpt/meta-legacy-layout/domxpath/xml_xpath_runner.html.ini
new file mode 100644
index 00000000000..e7d698afb6b
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/xml_xpath_runner.html.ini
@@ -0,0 +1,3072 @@
+[xml_xpath_runner.html]
+  [XPath tests]
+    expected: FAIL
+
+  [XPath tests 1]
+    expected: FAIL
+
+  [XPath tests 2]
+    expected: FAIL
+
+  [XPath tests 3]
+    expected: FAIL
+
+  [XPath tests 4]
+    expected: FAIL
+
+  [XPath tests 5]
+    expected: FAIL
+
+  [XPath tests 6]
+    expected: FAIL
+
+  [XPath tests 7]
+    expected: FAIL
+
+  [XPath tests 8]
+    expected: FAIL
+
+  [XPath tests 9]
+    expected: FAIL
+
+  [XPath tests 10]
+    expected: FAIL
+
+  [XPath tests 11]
+    expected: FAIL
+
+  [XPath tests 12]
+    expected: FAIL
+
+  [XPath tests 13]
+    expected: FAIL
+
+  [XPath tests 14]
+    expected: FAIL
+
+  [XPath tests 15]
+    expected: FAIL
+
+  [XPath tests 16]
+    expected: FAIL
+
+  [XPath tests 17]
+    expected: FAIL
+
+  [XPath tests 18]
+    expected: FAIL
+
+  [XPath tests 19]
+    expected: FAIL
+
+  [XPath tests 20]
+    expected: FAIL
+
+  [XPath tests 21]
+    expected: FAIL
+
+  [XPath tests 22]
+    expected: FAIL
+
+  [XPath tests 23]
+    expected: FAIL
+
+  [XPath tests 24]
+    expected: FAIL
+
+  [XPath tests 25]
+    expected: FAIL
+
+  [XPath tests 26]
+    expected: FAIL
+
+  [XPath tests 27]
+    expected: FAIL
+
+  [XPath tests 28]
+    expected: FAIL
+
+  [XPath tests 29]
+    expected: FAIL
+
+  [XPath tests 30]
+    expected: FAIL
+
+  [XPath tests 31]
+    expected: FAIL
+
+  [XPath tests 32]
+    expected: FAIL
+
+  [XPath tests 33]
+    expected: FAIL
+
+  [XPath tests 34]
+    expected: FAIL
+
+  [XPath tests 35]
+    expected: FAIL
+
+  [XPath tests 36]
+    expected: FAIL
+
+  [XPath tests 37]
+    expected: FAIL
+
+  [XPath tests 38]
+    expected: FAIL
+
+  [XPath tests 39]
+    expected: FAIL
+
+  [XPath tests 40]
+    expected: FAIL
+
+  [XPath tests 41]
+    expected: FAIL
+
+  [XPath tests 42]
+    expected: FAIL
+
+  [XPath tests 43]
+    expected: FAIL
+
+  [XPath tests 44]
+    expected: FAIL
+
+  [XPath tests 45]
+    expected: FAIL
+
+  [XPath tests 46]
+    expected: FAIL
+
+  [XPath tests 47]
+    expected: FAIL
+
+  [XPath tests 48]
+    expected: FAIL
+
+  [XPath tests 49]
+    expected: FAIL
+
+  [XPath tests 50]
+    expected: FAIL
+
+  [XPath tests 51]
+    expected: FAIL
+
+  [XPath tests 52]
+    expected: FAIL
+
+  [XPath tests 53]
+    expected: FAIL
+
+  [XPath tests 54]
+    expected: FAIL
+
+  [XPath tests 55]
+    expected: FAIL
+
+  [XPath tests 56]
+    expected: FAIL
+
+  [XPath tests 57]
+    expected: FAIL
+
+  [XPath tests 58]
+    expected: FAIL
+
+  [XPath tests 59]
+    expected: FAIL
+
+  [XPath tests 60]
+    expected: FAIL
+
+  [XPath tests 61]
+    expected: FAIL
+
+  [XPath tests 62]
+    expected: FAIL
+
+  [XPath tests 63]
+    expected: FAIL
+
+  [XPath tests 64]
+    expected: FAIL
+
+  [XPath tests 65]
+    expected: FAIL
+
+  [XPath tests 66]
+    expected: FAIL
+
+  [XPath tests 67]
+    expected: FAIL
+
+  [XPath tests 68]
+    expected: FAIL
+
+  [XPath tests 69]
+    expected: FAIL
+
+  [XPath tests 70]
+    expected: FAIL
+
+  [XPath tests 71]
+    expected: FAIL
+
+  [XPath tests 72]
+    expected: FAIL
+
+  [XPath tests 73]
+    expected: FAIL
+
+  [XPath tests 74]
+    expected: FAIL
+
+  [XPath tests 75]
+    expected: FAIL
+
+  [XPath tests 76]
+    expected: FAIL
+
+  [XPath tests 77]
+    expected: FAIL
+
+  [XPath tests 78]
+    expected: FAIL
+
+  [XPath tests 79]
+    expected: FAIL
+
+  [XPath tests 80]
+    expected: FAIL
+
+  [XPath tests 81]
+    expected: FAIL
+
+  [XPath tests 82]
+    expected: FAIL
+
+  [XPath tests 83]
+    expected: FAIL
+
+  [XPath tests 84]
+    expected: FAIL
+
+  [XPath tests 85]
+    expected: FAIL
+
+  [XPath tests 86]
+    expected: FAIL
+
+  [XPath tests 87]
+    expected: FAIL
+
+  [XPath tests 88]
+    expected: FAIL
+
+  [XPath tests 89]
+    expected: FAIL
+
+  [XPath tests 90]
+    expected: FAIL
+
+  [XPath tests 91]
+    expected: FAIL
+
+  [XPath tests 92]
+    expected: FAIL
+
+  [XPath tests 93]
+    expected: FAIL
+
+  [XPath tests 94]
+    expected: FAIL
+
+  [XPath tests 95]
+    expected: FAIL
+
+  [XPath tests 96]
+    expected: FAIL
+
+  [XPath tests 97]
+    expected: FAIL
+
+  [XPath tests 98]
+    expected: FAIL
+
+  [XPath tests 99]
+    expected: FAIL
+
+  [XPath tests 100]
+    expected: FAIL
+
+  [XPath tests 101]
+    expected: FAIL
+
+  [XPath tests 102]
+    expected: FAIL
+
+  [XPath tests 103]
+    expected: FAIL
+
+  [XPath tests 104]
+    expected: FAIL
+
+  [XPath tests 105]
+    expected: FAIL
+
+  [XPath tests 106]
+    expected: FAIL
+
+  [XPath tests 107]
+    expected: FAIL
+
+  [XPath tests 108]
+    expected: FAIL
+
+  [XPath tests 109]
+    expected: FAIL
+
+  [XPath tests 110]
+    expected: FAIL
+
+  [XPath tests 111]
+    expected: FAIL
+
+  [XPath tests 112]
+    expected: FAIL
+
+  [XPath tests 113]
+    expected: FAIL
+
+  [XPath tests 114]
+    expected: FAIL
+
+  [XPath tests 115]
+    expected: FAIL
+
+  [XPath tests 116]
+    expected: FAIL
+
+  [XPath tests 117]
+    expected: FAIL
+
+  [XPath tests 118]
+    expected: FAIL
+
+  [XPath tests 119]
+    expected: FAIL
+
+  [XPath tests 120]
+    expected: FAIL
+
+  [XPath tests 121]
+    expected: FAIL
+
+  [XPath tests 122]
+    expected: FAIL
+
+  [XPath tests 123]
+    expected: FAIL
+
+  [XPath tests 124]
+    expected: FAIL
+
+  [XPath tests 125]
+    expected: FAIL
+
+  [XPath tests 126]
+    expected: FAIL
+
+  [XPath tests 127]
+    expected: FAIL
+
+  [XPath tests 128]
+    expected: FAIL
+
+  [XPath tests 129]
+    expected: FAIL
+
+  [XPath tests 130]
+    expected: FAIL
+
+  [XPath tests 131]
+    expected: FAIL
+
+  [XPath tests 132]
+    expected: FAIL
+
+  [XPath tests 133]
+    expected: FAIL
+
+  [XPath tests 134]
+    expected: FAIL
+
+  [XPath tests 135]
+    expected: FAIL
+
+  [XPath tests 136]
+    expected: FAIL
+
+  [XPath tests 137]
+    expected: FAIL
+
+  [XPath tests 138]
+    expected: FAIL
+
+  [XPath tests 139]
+    expected: FAIL
+
+  [XPath tests 140]
+    expected: FAIL
+
+  [XPath tests 141]
+    expected: FAIL
+
+  [XPath tests 142]
+    expected: FAIL
+
+  [XPath tests 143]
+    expected: FAIL
+
+  [XPath tests 144]
+    expected: FAIL
+
+  [XPath tests 145]
+    expected: FAIL
+
+  [XPath tests 146]
+    expected: FAIL
+
+  [XPath tests 147]
+    expected: FAIL
+
+  [XPath tests 148]
+    expected: FAIL
+
+  [XPath tests 149]
+    expected: FAIL
+
+  [XPath tests 150]
+    expected: FAIL
+
+  [XPath tests 151]
+    expected: FAIL
+
+  [XPath tests 152]
+    expected: FAIL
+
+  [XPath tests 153]
+    expected: FAIL
+
+  [XPath tests 154]
+    expected: FAIL
+
+  [XPath tests 155]
+    expected: FAIL
+
+  [XPath tests 156]
+    expected: FAIL
+
+  [XPath tests 157]
+    expected: FAIL
+
+  [XPath tests 158]
+    expected: FAIL
+
+  [XPath tests 159]
+    expected: FAIL
+
+  [XPath tests 160]
+    expected: FAIL
+
+  [XPath tests 161]
+    expected: FAIL
+
+  [XPath tests 162]
+    expected: FAIL
+
+  [XPath tests 163]
+    expected: FAIL
+
+  [XPath tests 164]
+    expected: FAIL
+
+  [XPath tests 165]
+    expected: FAIL
+
+  [XPath tests 166]
+    expected: FAIL
+
+  [XPath tests 167]
+    expected: FAIL
+
+  [XPath tests 168]
+    expected: FAIL
+
+  [XPath tests 169]
+    expected: FAIL
+
+  [XPath tests 170]
+    expected: FAIL
+
+  [XPath tests 171]
+    expected: FAIL
+
+  [XPath tests 172]
+    expected: FAIL
+
+  [XPath tests 173]
+    expected: FAIL
+
+  [XPath tests 174]
+    expected: FAIL
+
+  [XPath tests 175]
+    expected: FAIL
+
+  [XPath tests 176]
+    expected: FAIL
+
+  [XPath tests 177]
+    expected: FAIL
+
+  [XPath tests 178]
+    expected: FAIL
+
+  [XPath tests 179]
+    expected: FAIL
+
+  [XPath tests 180]
+    expected: FAIL
+
+  [XPath tests 181]
+    expected: FAIL
+
+  [XPath tests 182]
+    expected: FAIL
+
+  [XPath tests 183]
+    expected: FAIL
+
+  [XPath tests 184]
+    expected: FAIL
+
+  [XPath tests 185]
+    expected: FAIL
+
+  [XPath tests 186]
+    expected: FAIL
+
+  [XPath tests 187]
+    expected: FAIL
+
+  [XPath tests 188]
+    expected: FAIL
+
+  [XPath tests 189]
+    expected: FAIL
+
+  [XPath tests 190]
+    expected: FAIL
+
+  [XPath tests 191]
+    expected: FAIL
+
+  [XPath tests 192]
+    expected: FAIL
+
+  [XPath tests 193]
+    expected: FAIL
+
+  [XPath tests 194]
+    expected: FAIL
+
+  [XPath tests 195]
+    expected: FAIL
+
+  [XPath tests 196]
+    expected: FAIL
+
+  [XPath tests 197]
+    expected: FAIL
+
+  [XPath tests 198]
+    expected: FAIL
+
+  [XPath tests 199]
+    expected: FAIL
+
+  [XPath tests 200]
+    expected: FAIL
+
+  [XPath tests 201]
+    expected: FAIL
+
+  [XPath tests 202]
+    expected: FAIL
+
+  [XPath tests 203]
+    expected: FAIL
+
+  [XPath tests 204]
+    expected: FAIL
+
+  [XPath tests 205]
+    expected: FAIL
+
+  [XPath tests 206]
+    expected: FAIL
+
+  [XPath tests 207]
+    expected: FAIL
+
+  [XPath tests 208]
+    expected: FAIL
+
+  [XPath tests 209]
+    expected: FAIL
+
+  [XPath tests 210]
+    expected: FAIL
+
+  [XPath tests 211]
+    expected: FAIL
+
+  [XPath tests 212]
+    expected: FAIL
+
+  [XPath tests 213]
+    expected: FAIL
+
+  [XPath tests 214]
+    expected: FAIL
+
+  [XPath tests 215]
+    expected: FAIL
+
+  [XPath tests 216]
+    expected: FAIL
+
+  [XPath tests 217]
+    expected: FAIL
+
+  [XPath tests 218]
+    expected: FAIL
+
+  [XPath tests 219]
+    expected: FAIL
+
+  [XPath tests 220]
+    expected: FAIL
+
+  [XPath tests 221]
+    expected: FAIL
+
+  [XPath tests 222]
+    expected: FAIL
+
+  [XPath tests 223]
+    expected: FAIL
+
+  [XPath tests 224]
+    expected: FAIL
+
+  [XPath tests 225]
+    expected: FAIL
+
+  [XPath tests 226]
+    expected: FAIL
+
+  [XPath tests 227]
+    expected: FAIL
+
+  [XPath tests 228]
+    expected: FAIL
+
+  [XPath tests 229]
+    expected: FAIL
+
+  [XPath tests 230]
+    expected: FAIL
+
+  [XPath tests 231]
+    expected: FAIL
+
+  [XPath tests 232]
+    expected: FAIL
+
+  [XPath tests 233]
+    expected: FAIL
+
+  [XPath tests 234]
+    expected: FAIL
+
+  [XPath tests 235]
+    expected: FAIL
+
+  [XPath tests 236]
+    expected: FAIL
+
+  [XPath tests 237]
+    expected: FAIL
+
+  [XPath tests 238]
+    expected: FAIL
+
+  [XPath tests 239]
+    expected: FAIL
+
+  [XPath tests 240]
+    expected: FAIL
+
+  [XPath tests 241]
+    expected: FAIL
+
+  [XPath tests 242]
+    expected: FAIL
+
+  [XPath tests 243]
+    expected: FAIL
+
+  [XPath tests 244]
+    expected: FAIL
+
+  [XPath tests 245]
+    expected: FAIL
+
+  [XPath tests 246]
+    expected: FAIL
+
+  [XPath tests 247]
+    expected: FAIL
+
+  [XPath tests 248]
+    expected: FAIL
+
+  [XPath tests 249]
+    expected: FAIL
+
+  [XPath tests 250]
+    expected: FAIL
+
+  [XPath tests 251]
+    expected: FAIL
+
+  [XPath tests 252]
+    expected: FAIL
+
+  [XPath tests 253]
+    expected: FAIL
+
+  [XPath tests 254]
+    expected: FAIL
+
+  [XPath tests 255]
+    expected: FAIL
+
+  [XPath tests 256]
+    expected: FAIL
+
+  [XPath tests 257]
+    expected: FAIL
+
+  [XPath tests 258]
+    expected: FAIL
+
+  [XPath tests 259]
+    expected: FAIL
+
+  [XPath tests 260]
+    expected: FAIL
+
+  [XPath tests 261]
+    expected: FAIL
+
+  [XPath tests 262]
+    expected: FAIL
+
+  [XPath tests 263]
+    expected: FAIL
+
+  [XPath tests 264]
+    expected: FAIL
+
+  [XPath tests 265]
+    expected: FAIL
+
+  [XPath tests 266]
+    expected: FAIL
+
+  [XPath tests 267]
+    expected: FAIL
+
+  [XPath tests 268]
+    expected: FAIL
+
+  [XPath tests 269]
+    expected: FAIL
+
+  [XPath tests 270]
+    expected: FAIL
+
+  [XPath tests 271]
+    expected: FAIL
+
+  [XPath tests 272]
+    expected: FAIL
+
+  [XPath tests 273]
+    expected: FAIL
+
+  [XPath tests 274]
+    expected: FAIL
+
+  [XPath tests 275]
+    expected: FAIL
+
+  [XPath tests 276]
+    expected: FAIL
+
+  [XPath tests 277]
+    expected: FAIL
+
+  [XPath tests 278]
+    expected: FAIL
+
+  [XPath tests 279]
+    expected: FAIL
+
+  [XPath tests 280]
+    expected: FAIL
+
+  [XPath tests 281]
+    expected: FAIL
+
+  [XPath tests 282]
+    expected: FAIL
+
+  [XPath tests 283]
+    expected: FAIL
+
+  [XPath tests 284]
+    expected: FAIL
+
+  [XPath tests 285]
+    expected: FAIL
+
+  [XPath tests 286]
+    expected: FAIL
+
+  [XPath tests 287]
+    expected: FAIL
+
+  [XPath tests 288]
+    expected: FAIL
+
+  [XPath tests 289]
+    expected: FAIL
+
+  [XPath tests 290]
+    expected: FAIL
+
+  [XPath tests 291]
+    expected: FAIL
+
+  [XPath tests 292]
+    expected: FAIL
+
+  [XPath tests 293]
+    expected: FAIL
+
+  [XPath tests 294]
+    expected: FAIL
+
+  [XPath tests 295]
+    expected: FAIL
+
+  [XPath tests 296]
+    expected: FAIL
+
+  [XPath tests 297]
+    expected: FAIL
+
+  [XPath tests 298]
+    expected: FAIL
+
+  [XPath tests 299]
+    expected: FAIL
+
+  [XPath tests 300]
+    expected: FAIL
+
+  [XPath tests 301]
+    expected: FAIL
+
+  [XPath tests 302]
+    expected: FAIL
+
+  [XPath tests 303]
+    expected: FAIL
+
+  [XPath tests 304]
+    expected: FAIL
+
+  [XPath tests 305]
+    expected: FAIL
+
+  [XPath tests 306]
+    expected: FAIL
+
+  [XPath tests 307]
+    expected: FAIL
+
+  [XPath tests 308]
+    expected: FAIL
+
+  [XPath tests 309]
+    expected: FAIL
+
+  [XPath tests 310]
+    expected: FAIL
+
+  [XPath tests 311]
+    expected: FAIL
+
+  [XPath tests 312]
+    expected: FAIL
+
+  [XPath tests 313]
+    expected: FAIL
+
+  [XPath tests 314]
+    expected: FAIL
+
+  [XPath tests 315]
+    expected: FAIL
+
+  [XPath tests 316]
+    expected: FAIL
+
+  [XPath tests 317]
+    expected: FAIL
+
+  [XPath tests 318]
+    expected: FAIL
+
+  [XPath tests 319]
+    expected: FAIL
+
+  [XPath tests 320]
+    expected: FAIL
+
+  [XPath tests 321]
+    expected: FAIL
+
+  [XPath tests 322]
+    expected: FAIL
+
+  [XPath tests 323]
+    expected: FAIL
+
+  [XPath tests 324]
+    expected: FAIL
+
+  [XPath tests 325]
+    expected: FAIL
+
+  [XPath tests 326]
+    expected: FAIL
+
+  [XPath tests 327]
+    expected: FAIL
+
+  [XPath tests 328]
+    expected: FAIL
+
+  [XPath tests 329]
+    expected: FAIL
+
+  [XPath tests 330]
+    expected: FAIL
+
+  [XPath tests 331]
+    expected: FAIL
+
+  [XPath tests 332]
+    expected: FAIL
+
+  [XPath tests 333]
+    expected: FAIL
+
+  [XPath tests 334]
+    expected: FAIL
+
+  [XPath tests 335]
+    expected: FAIL
+
+  [XPath tests 336]
+    expected: FAIL
+
+  [XPath tests 337]
+    expected: FAIL
+
+  [XPath tests 338]
+    expected: FAIL
+
+  [XPath tests 339]
+    expected: FAIL
+
+  [XPath tests 340]
+    expected: FAIL
+
+  [XPath tests 341]
+    expected: FAIL
+
+  [XPath tests 342]
+    expected: FAIL
+
+  [XPath tests 343]
+    expected: FAIL
+
+  [XPath tests 344]
+    expected: FAIL
+
+  [XPath tests 345]
+    expected: FAIL
+
+  [XPath tests 346]
+    expected: FAIL
+
+  [XPath tests 347]
+    expected: FAIL
+
+  [XPath tests 348]
+    expected: FAIL
+
+  [XPath tests 349]
+    expected: FAIL
+
+  [XPath tests 350]
+    expected: FAIL
+
+  [XPath tests 351]
+    expected: FAIL
+
+  [XPath tests 352]
+    expected: FAIL
+
+  [XPath tests 353]
+    expected: FAIL
+
+  [XPath tests 354]
+    expected: FAIL
+
+  [XPath tests 355]
+    expected: FAIL
+
+  [XPath tests 356]
+    expected: FAIL
+
+  [XPath tests 357]
+    expected: FAIL
+
+  [XPath tests 358]
+    expected: FAIL
+
+  [XPath tests 359]
+    expected: FAIL
+
+  [XPath tests 360]
+    expected: FAIL
+
+  [XPath tests 361]
+    expected: FAIL
+
+  [XPath tests 362]
+    expected: FAIL
+
+  [XPath tests 363]
+    expected: FAIL
+
+  [XPath tests 364]
+    expected: FAIL
+
+  [XPath tests 365]
+    expected: FAIL
+
+  [XPath tests 366]
+    expected: FAIL
+
+  [XPath tests 367]
+    expected: FAIL
+
+  [XPath tests 368]
+    expected: FAIL
+
+  [XPath tests 369]
+    expected: FAIL
+
+  [XPath tests 370]
+    expected: FAIL
+
+  [XPath tests 371]
+    expected: FAIL
+
+  [XPath tests 372]
+    expected: FAIL
+
+  [XPath tests 373]
+    expected: FAIL
+
+  [XPath tests 374]
+    expected: FAIL
+
+  [XPath tests 375]
+    expected: FAIL
+
+  [XPath tests 376]
+    expected: FAIL
+
+  [XPath tests 377]
+    expected: FAIL
+
+  [XPath tests 378]
+    expected: FAIL
+
+  [XPath tests 379]
+    expected: FAIL
+
+  [XPath tests 380]
+    expected: FAIL
+
+  [XPath tests 381]
+    expected: FAIL
+
+  [XPath tests 382]
+    expected: FAIL
+
+  [XPath tests 383]
+    expected: FAIL
+
+  [XPath tests 384]
+    expected: FAIL
+
+  [XPath tests 385]
+    expected: FAIL
+
+  [XPath tests 386]
+    expected: FAIL
+
+  [XPath tests 387]
+    expected: FAIL
+
+  [XPath tests 388]
+    expected: FAIL
+
+  [XPath tests 389]
+    expected: FAIL
+
+  [XPath tests 390]
+    expected: FAIL
+
+  [XPath tests 391]
+    expected: FAIL
+
+  [XPath tests 392]
+    expected: FAIL
+
+  [XPath tests 393]
+    expected: FAIL
+
+  [XPath tests 394]
+    expected: FAIL
+
+  [XPath tests 395]
+    expected: FAIL
+
+  [XPath tests 396]
+    expected: FAIL
+
+  [XPath tests 397]
+    expected: FAIL
+
+  [XPath tests 398]
+    expected: FAIL
+
+  [XPath tests 399]
+    expected: FAIL
+
+  [XPath tests 400]
+    expected: FAIL
+
+  [XPath tests 401]
+    expected: FAIL
+
+  [XPath tests 402]
+    expected: FAIL
+
+  [XPath tests 403]
+    expected: FAIL
+
+  [XPath tests 404]
+    expected: FAIL
+
+  [XPath tests 405]
+    expected: FAIL
+
+  [XPath tests 406]
+    expected: FAIL
+
+  [XPath tests 407]
+    expected: FAIL
+
+  [XPath tests 408]
+    expected: FAIL
+
+  [XPath tests 409]
+    expected: FAIL
+
+  [XPath tests 410]
+    expected: FAIL
+
+  [XPath tests 411]
+    expected: FAIL
+
+  [XPath tests 412]
+    expected: FAIL
+
+  [XPath tests 413]
+    expected: FAIL
+
+  [XPath tests 414]
+    expected: FAIL
+
+  [XPath tests 415]
+    expected: FAIL
+
+  [XPath tests 416]
+    expected: FAIL
+
+  [XPath tests 417]
+    expected: FAIL
+
+  [XPath tests 418]
+    expected: FAIL
+
+  [XPath tests 419]
+    expected: FAIL
+
+  [XPath tests 420]
+    expected: FAIL
+
+  [XPath tests 421]
+    expected: FAIL
+
+  [XPath tests 422]
+    expected: FAIL
+
+  [XPath tests 423]
+    expected: FAIL
+
+  [XPath tests 424]
+    expected: FAIL
+
+  [XPath tests 425]
+    expected: FAIL
+
+  [XPath tests 426]
+    expected: FAIL
+
+  [XPath tests 427]
+    expected: FAIL
+
+  [XPath tests 428]
+    expected: FAIL
+
+  [XPath tests 429]
+    expected: FAIL
+
+  [XPath tests 430]
+    expected: FAIL
+
+  [XPath tests 431]
+    expected: FAIL
+
+  [XPath tests 432]
+    expected: FAIL
+
+  [XPath tests 433]
+    expected: FAIL
+
+  [XPath tests 434]
+    expected: FAIL
+
+  [XPath tests 435]
+    expected: FAIL
+
+  [XPath tests 436]
+    expected: FAIL
+
+  [XPath tests 437]
+    expected: FAIL
+
+  [XPath tests 438]
+    expected: FAIL
+
+  [XPath tests 439]
+    expected: FAIL
+
+  [XPath tests 440]
+    expected: FAIL
+
+  [XPath tests 441]
+    expected: FAIL
+
+  [XPath tests 442]
+    expected: FAIL
+
+  [XPath tests 443]
+    expected: FAIL
+
+  [XPath tests 444]
+    expected: FAIL
+
+  [XPath tests 445]
+    expected: FAIL
+
+  [XPath tests 446]
+    expected: FAIL
+
+  [XPath tests 447]
+    expected: FAIL
+
+  [XPath tests 448]
+    expected: FAIL
+
+  [XPath tests 449]
+    expected: FAIL
+
+  [XPath tests 450]
+    expected: FAIL
+
+  [XPath tests 451]
+    expected: FAIL
+
+  [XPath tests 452]
+    expected: FAIL
+
+  [XPath tests 453]
+    expected: FAIL
+
+  [XPath tests 454]
+    expected: FAIL
+
+  [XPath tests 455]
+    expected: FAIL
+
+  [XPath tests 456]
+    expected: FAIL
+
+  [XPath tests 457]
+    expected: FAIL
+
+  [XPath tests 458]
+    expected: FAIL
+
+  [XPath tests 459]
+    expected: FAIL
+
+  [XPath tests 460]
+    expected: FAIL
+
+  [XPath tests 461]
+    expected: FAIL
+
+  [XPath tests 462]
+    expected: FAIL
+
+  [XPath tests 463]
+    expected: FAIL
+
+  [XPath tests 464]
+    expected: FAIL
+
+  [XPath tests 465]
+    expected: FAIL
+
+  [XPath tests 466]
+    expected: FAIL
+
+  [XPath tests 467]
+    expected: FAIL
+
+  [XPath tests 468]
+    expected: FAIL
+
+  [XPath tests 469]
+    expected: FAIL
+
+  [XPath tests 470]
+    expected: FAIL
+
+  [XPath tests 471]
+    expected: FAIL
+
+  [XPath tests 472]
+    expected: FAIL
+
+  [XPath tests 473]
+    expected: FAIL
+
+  [XPath tests 474]
+    expected: FAIL
+
+  [XPath tests 475]
+    expected: FAIL
+
+  [XPath tests 476]
+    expected: FAIL
+
+  [XPath tests 477]
+    expected: FAIL
+
+  [XPath tests 478]
+    expected: FAIL
+
+  [XPath tests 479]
+    expected: FAIL
+
+  [XPath tests 480]
+    expected: FAIL
+
+  [XPath tests 481]
+    expected: FAIL
+
+  [XPath tests 482]
+    expected: FAIL
+
+  [XPath tests 483]
+    expected: FAIL
+
+  [XPath tests 484]
+    expected: FAIL
+
+  [XPath tests 485]
+    expected: FAIL
+
+  [XPath tests 486]
+    expected: FAIL
+
+  [XPath tests 487]
+    expected: FAIL
+
+  [XPath tests 488]
+    expected: FAIL
+
+  [XPath tests 489]
+    expected: FAIL
+
+  [XPath tests 490]
+    expected: FAIL
+
+  [XPath tests 491]
+    expected: FAIL
+
+  [XPath tests 492]
+    expected: FAIL
+
+  [XPath tests 493]
+    expected: FAIL
+
+  [XPath tests 494]
+    expected: FAIL
+
+  [XPath tests 495]
+    expected: FAIL
+
+  [XPath tests 496]
+    expected: FAIL
+
+  [XPath tests 497]
+    expected: FAIL
+
+  [XPath tests 498]
+    expected: FAIL
+
+  [XPath tests 499]
+    expected: FAIL
+
+  [XPath tests 500]
+    expected: FAIL
+
+  [XPath tests 501]
+    expected: FAIL
+
+  [XPath tests 502]
+    expected: FAIL
+
+  [XPath tests 503]
+    expected: FAIL
+
+  [XPath tests 504]
+    expected: FAIL
+
+  [XPath tests 505]
+    expected: FAIL
+
+  [XPath tests 506]
+    expected: FAIL
+
+  [XPath tests 507]
+    expected: FAIL
+
+  [XPath tests 508]
+    expected: FAIL
+
+  [XPath tests 509]
+    expected: FAIL
+
+  [XPath tests 510]
+    expected: FAIL
+
+  [XPath tests 511]
+    expected: FAIL
+
+  [XPath tests 512]
+    expected: FAIL
+
+  [XPath tests 513]
+    expected: FAIL
+
+  [XPath tests 514]
+    expected: FAIL
+
+  [XPath tests 515]
+    expected: FAIL
+
+  [XPath tests 516]
+    expected: FAIL
+
+  [XPath tests 517]
+    expected: FAIL
+
+  [XPath tests 518]
+    expected: FAIL
+
+  [XPath tests 519]
+    expected: FAIL
+
+  [XPath tests 520]
+    expected: FAIL
+
+  [XPath tests 521]
+    expected: FAIL
+
+  [XPath tests 522]
+    expected: FAIL
+
+  [XPath tests 523]
+    expected: FAIL
+
+  [XPath tests 524]
+    expected: FAIL
+
+  [XPath tests 525]
+    expected: FAIL
+
+  [XPath tests 526]
+    expected: FAIL
+
+  [XPath tests 527]
+    expected: FAIL
+
+  [XPath tests 528]
+    expected: FAIL
+
+  [XPath tests 529]
+    expected: FAIL
+
+  [XPath tests 530]
+    expected: FAIL
+
+  [XPath tests 531]
+    expected: FAIL
+
+  [XPath tests 532]
+    expected: FAIL
+
+  [XPath tests 533]
+    expected: FAIL
+
+  [XPath tests 534]
+    expected: FAIL
+
+  [XPath tests 535]
+    expected: FAIL
+
+  [XPath tests 536]
+    expected: FAIL
+
+  [XPath tests 537]
+    expected: FAIL
+
+  [XPath tests 538]
+    expected: FAIL
+
+  [XPath tests 539]
+    expected: FAIL
+
+  [XPath tests 540]
+    expected: FAIL
+
+  [XPath tests 541]
+    expected: FAIL
+
+  [XPath tests 542]
+    expected: FAIL
+
+  [XPath tests 543]
+    expected: FAIL
+
+  [XPath tests 544]
+    expected: FAIL
+
+  [XPath tests 545]
+    expected: FAIL
+
+  [XPath tests 546]
+    expected: FAIL
+
+  [XPath tests 547]
+    expected: FAIL
+
+  [XPath tests 548]
+    expected: FAIL
+
+  [XPath tests 549]
+    expected: FAIL
+
+  [XPath tests 550]
+    expected: FAIL
+
+  [XPath tests 551]
+    expected: FAIL
+
+  [XPath tests 552]
+    expected: FAIL
+
+  [XPath tests 553]
+    expected: FAIL
+
+  [XPath tests 554]
+    expected: FAIL
+
+  [XPath tests 555]
+    expected: FAIL
+
+  [XPath tests 556]
+    expected: FAIL
+
+  [XPath tests 557]
+    expected: FAIL
+
+  [XPath tests 558]
+    expected: FAIL
+
+  [XPath tests 559]
+    expected: FAIL
+
+  [XPath tests 560]
+    expected: FAIL
+
+  [XPath tests 561]
+    expected: FAIL
+
+  [XPath tests 562]
+    expected: FAIL
+
+  [XPath tests 563]
+    expected: FAIL
+
+  [XPath tests 564]
+    expected: FAIL
+
+  [XPath tests 565]
+    expected: FAIL
+
+  [XPath tests 566]
+    expected: FAIL
+
+  [XPath tests 567]
+    expected: FAIL
+
+  [XPath tests 568]
+    expected: FAIL
+
+  [XPath tests 569]
+    expected: FAIL
+
+  [XPath tests 570]
+    expected: FAIL
+
+  [XPath tests 571]
+    expected: FAIL
+
+  [XPath tests 572]
+    expected: FAIL
+
+  [XPath tests 573]
+    expected: FAIL
+
+  [XPath tests 574]
+    expected: FAIL
+
+  [XPath tests 575]
+    expected: FAIL
+
+  [XPath tests 576]
+    expected: FAIL
+
+  [XPath tests 577]
+    expected: FAIL
+
+  [XPath tests 578]
+    expected: FAIL
+
+  [XPath tests 579]
+    expected: FAIL
+
+  [XPath tests 580]
+    expected: FAIL
+
+  [XPath tests 581]
+    expected: FAIL
+
+  [XPath tests 582]
+    expected: FAIL
+
+  [XPath tests 583]
+    expected: FAIL
+
+  [XPath tests 584]
+    expected: FAIL
+
+  [XPath tests 585]
+    expected: FAIL
+
+  [XPath tests 586]
+    expected: FAIL
+
+  [XPath tests 587]
+    expected: FAIL
+
+  [XPath tests 588]
+    expected: FAIL
+
+  [XPath tests 589]
+    expected: FAIL
+
+  [XPath tests 590]
+    expected: FAIL
+
+  [XPath tests 591]
+    expected: FAIL
+
+  [XPath tests 592]
+    expected: FAIL
+
+  [XPath tests 593]
+    expected: FAIL
+
+  [XPath tests 594]
+    expected: FAIL
+
+  [XPath tests 595]
+    expected: FAIL
+
+  [XPath tests 596]
+    expected: FAIL
+
+  [XPath tests 597]
+    expected: FAIL
+
+  [XPath tests 598]
+    expected: FAIL
+
+  [XPath tests 599]
+    expected: FAIL
+
+  [XPath tests 600]
+    expected: FAIL
+
+  [XPath tests 601]
+    expected: FAIL
+
+  [XPath tests 602]
+    expected: FAIL
+
+  [XPath tests 603]
+    expected: FAIL
+
+  [XPath tests 604]
+    expected: FAIL
+
+  [XPath tests 605]
+    expected: FAIL
+
+  [XPath tests 606]
+    expected: FAIL
+
+  [XPath tests 607]
+    expected: FAIL
+
+  [XPath tests 608]
+    expected: FAIL
+
+  [XPath tests 609]
+    expected: FAIL
+
+  [XPath tests 610]
+    expected: FAIL
+
+  [XPath tests 611]
+    expected: FAIL
+
+  [XPath tests 612]
+    expected: FAIL
+
+  [XPath tests 613]
+    expected: FAIL
+
+  [XPath tests 614]
+    expected: FAIL
+
+  [XPath tests 615]
+    expected: FAIL
+
+  [XPath tests 616]
+    expected: FAIL
+
+  [XPath tests 617]
+    expected: FAIL
+
+  [XPath tests 618]
+    expected: FAIL
+
+  [XPath tests 619]
+    expected: FAIL
+
+  [XPath tests 620]
+    expected: FAIL
+
+  [XPath tests 621]
+    expected: FAIL
+
+  [XPath tests 622]
+    expected: FAIL
+
+  [XPath tests 623]
+    expected: FAIL
+
+  [XPath tests 624]
+    expected: FAIL
+
+  [XPath tests 625]
+    expected: FAIL
+
+  [XPath tests 626]
+    expected: FAIL
+
+  [XPath tests 627]
+    expected: FAIL
+
+  [XPath tests 628]
+    expected: FAIL
+
+  [XPath tests 629]
+    expected: FAIL
+
+  [XPath tests 630]
+    expected: FAIL
+
+  [XPath tests 631]
+    expected: FAIL
+
+  [XPath tests 632]
+    expected: FAIL
+
+  [XPath tests 633]
+    expected: FAIL
+
+  [XPath tests 634]
+    expected: FAIL
+
+  [XPath tests 635]
+    expected: FAIL
+
+  [XPath tests 636]
+    expected: FAIL
+
+  [XPath tests 637]
+    expected: FAIL
+
+  [XPath tests 638]
+    expected: FAIL
+
+  [XPath tests 639]
+    expected: FAIL
+
+  [XPath tests 640]
+    expected: FAIL
+
+  [XPath tests 641]
+    expected: FAIL
+
+  [XPath tests 642]
+    expected: FAIL
+
+  [XPath tests 643]
+    expected: FAIL
+
+  [XPath tests 644]
+    expected: FAIL
+
+  [XPath tests 645]
+    expected: FAIL
+
+  [XPath tests 646]
+    expected: FAIL
+
+  [XPath tests 647]
+    expected: FAIL
+
+  [XPath tests 648]
+    expected: FAIL
+
+  [XPath tests 649]
+    expected: FAIL
+
+  [XPath tests 650]
+    expected: FAIL
+
+  [XPath tests 651]
+    expected: FAIL
+
+  [XPath tests 652]
+    expected: FAIL
+
+  [XPath tests 653]
+    expected: FAIL
+
+  [XPath tests 654]
+    expected: FAIL
+
+  [XPath tests 655]
+    expected: FAIL
+
+  [XPath tests 656]
+    expected: FAIL
+
+  [XPath tests 657]
+    expected: FAIL
+
+  [XPath tests 658]
+    expected: FAIL
+
+  [XPath tests 659]
+    expected: FAIL
+
+  [XPath tests 660]
+    expected: FAIL
+
+  [XPath tests 661]
+    expected: FAIL
+
+  [XPath tests 662]
+    expected: FAIL
+
+  [XPath tests 663]
+    expected: FAIL
+
+  [XPath tests 664]
+    expected: FAIL
+
+  [XPath tests 665]
+    expected: FAIL
+
+  [XPath tests 666]
+    expected: FAIL
+
+  [XPath tests 667]
+    expected: FAIL
+
+  [XPath tests 668]
+    expected: FAIL
+
+  [XPath tests 669]
+    expected: FAIL
+
+  [XPath tests 670]
+    expected: FAIL
+
+  [XPath tests 671]
+    expected: FAIL
+
+  [XPath tests 672]
+    expected: FAIL
+
+  [XPath tests 673]
+    expected: FAIL
+
+  [XPath tests 674]
+    expected: FAIL
+
+  [XPath tests 675]
+    expected: FAIL
+
+  [XPath tests 676]
+    expected: FAIL
+
+  [XPath tests 677]
+    expected: FAIL
+
+  [XPath tests 678]
+    expected: FAIL
+
+  [XPath tests 679]
+    expected: FAIL
+
+  [XPath tests 680]
+    expected: FAIL
+
+  [XPath tests 681]
+    expected: FAIL
+
+  [XPath tests 682]
+    expected: FAIL
+
+  [XPath tests 683]
+    expected: FAIL
+
+  [XPath tests 684]
+    expected: FAIL
+
+  [XPath tests 685]
+    expected: FAIL
+
+  [XPath tests 686]
+    expected: FAIL
+
+  [XPath tests 687]
+    expected: FAIL
+
+  [XPath tests 688]
+    expected: FAIL
+
+  [XPath tests 689]
+    expected: FAIL
+
+  [XPath tests 690]
+    expected: FAIL
+
+  [XPath tests 691]
+    expected: FAIL
+
+  [XPath tests 692]
+    expected: FAIL
+
+  [XPath tests 693]
+    expected: FAIL
+
+  [XPath tests 694]
+    expected: FAIL
+
+  [XPath tests 695]
+    expected: FAIL
+
+  [XPath tests 696]
+    expected: FAIL
+
+  [XPath tests 697]
+    expected: FAIL
+
+  [XPath tests 698]
+    expected: FAIL
+
+  [XPath tests 699]
+    expected: FAIL
+
+  [XPath tests 700]
+    expected: FAIL
+
+  [XPath tests 701]
+    expected: FAIL
+
+  [XPath tests 702]
+    expected: FAIL
+
+  [XPath tests 703]
+    expected: FAIL
+
+  [XPath tests 704]
+    expected: FAIL
+
+  [XPath tests 705]
+    expected: FAIL
+
+  [XPath tests 706]
+    expected: FAIL
+
+  [XPath tests 707]
+    expected: FAIL
+
+  [XPath tests 708]
+    expected: FAIL
+
+  [XPath tests 709]
+    expected: FAIL
+
+  [XPath tests 710]
+    expected: FAIL
+
+  [XPath tests 711]
+    expected: FAIL
+
+  [XPath tests 712]
+    expected: FAIL
+
+  [XPath tests 713]
+    expected: FAIL
+
+  [XPath tests 714]
+    expected: FAIL
+
+  [XPath tests 715]
+    expected: FAIL
+
+  [XPath tests 716]
+    expected: FAIL
+
+  [XPath tests 717]
+    expected: FAIL
+
+  [XPath tests 718]
+    expected: FAIL
+
+  [XPath tests 719]
+    expected: FAIL
+
+  [XPath tests 720]
+    expected: FAIL
+
+  [XPath tests 721]
+    expected: FAIL
+
+  [XPath tests 722]
+    expected: FAIL
+
+  [XPath tests 723]
+    expected: FAIL
+
+  [XPath tests 724]
+    expected: FAIL
+
+  [XPath tests 725]
+    expected: FAIL
+
+  [XPath tests 726]
+    expected: FAIL
+
+  [XPath tests 727]
+    expected: FAIL
+
+  [XPath tests 728]
+    expected: FAIL
+
+  [XPath tests 729]
+    expected: FAIL
+
+  [XPath tests 730]
+    expected: FAIL
+
+  [XPath tests 731]
+    expected: FAIL
+
+  [XPath tests 732]
+    expected: FAIL
+
+  [XPath tests 733]
+    expected: FAIL
+
+  [XPath tests 734]
+    expected: FAIL
+
+  [XPath tests 735]
+    expected: FAIL
+
+  [XPath tests 736]
+    expected: FAIL
+
+  [XPath tests 737]
+    expected: FAIL
+
+  [XPath tests 738]
+    expected: FAIL
+
+  [XPath tests 739]
+    expected: FAIL
+
+  [XPath tests 740]
+    expected: FAIL
+
+  [XPath tests 741]
+    expected: FAIL
+
+  [XPath tests 742]
+    expected: FAIL
+
+  [XPath tests 743]
+    expected: FAIL
+
+  [XPath tests 744]
+    expected: FAIL
+
+  [XPath tests 745]
+    expected: FAIL
+
+  [XPath tests 746]
+    expected: FAIL
+
+  [XPath tests 747]
+    expected: FAIL
+
+  [XPath tests 748]
+    expected: FAIL
+
+  [XPath tests 749]
+    expected: FAIL
+
+  [XPath tests 750]
+    expected: FAIL
+
+  [XPath tests 751]
+    expected: FAIL
+
+  [XPath tests 752]
+    expected: FAIL
+
+  [XPath tests 753]
+    expected: FAIL
+
+  [XPath tests 754]
+    expected: FAIL
+
+  [XPath tests 755]
+    expected: FAIL
+
+  [XPath tests 756]
+    expected: FAIL
+
+  [XPath tests 757]
+    expected: FAIL
+
+  [XPath tests 758]
+    expected: FAIL
+
+  [XPath tests 759]
+    expected: FAIL
+
+  [XPath tests 760]
+    expected: FAIL
+
+  [XPath tests 761]
+    expected: FAIL
+
+  [XPath tests 762]
+    expected: FAIL
+
+  [XPath tests 763]
+    expected: FAIL
+
+  [XPath tests 764]
+    expected: FAIL
+
+  [XPath tests 765]
+    expected: FAIL
+
+  [XPath tests 766]
+    expected: FAIL
+
+  [XPath tests 767]
+    expected: FAIL
+
+  [XPath tests 768]
+    expected: FAIL
+
+  [XPath tests 769]
+    expected: FAIL
+
+  [XPath tests 770]
+    expected: FAIL
+
+  [XPath tests 771]
+    expected: FAIL
+
+  [XPath tests 772]
+    expected: FAIL
+
+  [XPath tests 773]
+    expected: FAIL
+
+  [XPath tests 774]
+    expected: FAIL
+
+  [XPath tests 775]
+    expected: FAIL
+
+  [XPath tests 776]
+    expected: FAIL
+
+  [XPath tests 777]
+    expected: FAIL
+
+  [XPath tests 778]
+    expected: FAIL
+
+  [XPath tests 779]
+    expected: FAIL
+
+  [XPath tests 780]
+    expected: FAIL
+
+  [XPath tests 781]
+    expected: FAIL
+
+  [XPath tests 782]
+    expected: FAIL
+
+  [XPath tests 783]
+    expected: FAIL
+
+  [XPath tests 784]
+    expected: FAIL
+
+  [XPath tests 785]
+    expected: FAIL
+
+  [XPath tests 786]
+    expected: FAIL
+
+  [XPath tests 787]
+    expected: FAIL
+
+  [XPath tests 788]
+    expected: FAIL
+
+  [XPath tests 789]
+    expected: FAIL
+
+  [XPath tests 790]
+    expected: FAIL
+
+  [XPath tests 791]
+    expected: FAIL
+
+  [XPath tests 792]
+    expected: FAIL
+
+  [XPath tests 793]
+    expected: FAIL
+
+  [XPath tests 794]
+    expected: FAIL
+
+  [XPath tests 795]
+    expected: FAIL
+
+  [XPath tests 796]
+    expected: FAIL
+
+  [XPath tests 797]
+    expected: FAIL
+
+  [XPath tests 798]
+    expected: FAIL
+
+  [XPath tests 799]
+    expected: FAIL
+
+  [XPath tests 800]
+    expected: FAIL
+
+  [XPath tests 801]
+    expected: FAIL
+
+  [XPath tests 802]
+    expected: FAIL
+
+  [XPath tests 803]
+    expected: FAIL
+
+  [XPath tests 804]
+    expected: FAIL
+
+  [XPath tests 805]
+    expected: FAIL
+
+  [XPath tests 806]
+    expected: FAIL
+
+  [XPath tests 807]
+    expected: FAIL
+
+  [XPath tests 808]
+    expected: FAIL
+
+  [XPath tests 809]
+    expected: FAIL
+
+  [XPath tests 810]
+    expected: FAIL
+
+  [XPath tests 811]
+    expected: FAIL
+
+  [XPath tests 812]
+    expected: FAIL
+
+  [XPath tests 813]
+    expected: FAIL
+
+  [XPath tests 814]
+    expected: FAIL
+
+  [XPath tests 815]
+    expected: FAIL
+
+  [XPath tests 816]
+    expected: FAIL
+
+  [XPath tests 817]
+    expected: FAIL
+
+  [XPath tests 818]
+    expected: FAIL
+
+  [XPath tests 819]
+    expected: FAIL
+
+  [XPath tests 820]
+    expected: FAIL
+
+  [XPath tests 821]
+    expected: FAIL
+
+  [XPath tests 822]
+    expected: FAIL
+
+  [XPath tests 823]
+    expected: FAIL
+
+  [XPath tests 824]
+    expected: FAIL
+
+  [XPath tests 825]
+    expected: FAIL
+
+  [XPath tests 826]
+    expected: FAIL
+
+  [XPath tests 827]
+    expected: FAIL
+
+  [XPath tests 828]
+    expected: FAIL
+
+  [XPath tests 829]
+    expected: FAIL
+
+  [XPath tests 830]
+    expected: FAIL
+
+  [XPath tests 831]
+    expected: FAIL
+
+  [XPath tests 832]
+    expected: FAIL
+
+  [XPath tests 833]
+    expected: FAIL
+
+  [XPath tests 834]
+    expected: FAIL
+
+  [XPath tests 835]
+    expected: FAIL
+
+  [XPath tests 836]
+    expected: FAIL
+
+  [XPath tests 837]
+    expected: FAIL
+
+  [XPath tests 838]
+    expected: FAIL
+
+  [XPath tests 839]
+    expected: FAIL
+
+  [XPath tests 840]
+    expected: FAIL
+
+  [XPath tests 841]
+    expected: FAIL
+
+  [XPath tests 842]
+    expected: FAIL
+
+  [XPath tests 843]
+    expected: FAIL
+
+  [XPath tests 844]
+    expected: FAIL
+
+  [XPath tests 845]
+    expected: FAIL
+
+  [XPath tests 846]
+    expected: FAIL
+
+  [XPath tests 847]
+    expected: FAIL
+
+  [XPath tests 848]
+    expected: FAIL
+
+  [XPath tests 849]
+    expected: FAIL
+
+  [XPath tests 850]
+    expected: FAIL
+
+  [XPath tests 851]
+    expected: FAIL
+
+  [XPath tests 852]
+    expected: FAIL
+
+  [XPath tests 853]
+    expected: FAIL
+
+  [XPath tests 854]
+    expected: FAIL
+
+  [XPath tests 855]
+    expected: FAIL
+
+  [XPath tests 856]
+    expected: FAIL
+
+  [XPath tests 857]
+    expected: FAIL
+
+  [XPath tests 858]
+    expected: FAIL
+
+  [XPath tests 859]
+    expected: FAIL
+
+  [XPath tests 860]
+    expected: FAIL
+
+  [XPath tests 861]
+    expected: FAIL
+
+  [XPath tests 862]
+    expected: FAIL
+
+  [XPath tests 863]
+    expected: FAIL
+
+  [XPath tests 864]
+    expected: FAIL
+
+  [XPath tests 865]
+    expected: FAIL
+
+  [XPath tests 866]
+    expected: FAIL
+
+  [XPath tests 867]
+    expected: FAIL
+
+  [XPath tests 868]
+    expected: FAIL
+
+  [XPath tests 869]
+    expected: FAIL
+
+  [XPath tests 870]
+    expected: FAIL
+
+  [XPath tests 871]
+    expected: FAIL
+
+  [XPath tests 872]
+    expected: FAIL
+
+  [XPath tests 873]
+    expected: FAIL
+
+  [XPath tests 874]
+    expected: FAIL
+
+  [XPath tests 875]
+    expected: FAIL
+
+  [XPath tests 876]
+    expected: FAIL
+
+  [XPath tests 877]
+    expected: FAIL
+
+  [XPath tests 878]
+    expected: FAIL
+
+  [XPath tests 879]
+    expected: FAIL
+
+  [XPath tests 880]
+    expected: FAIL
+
+  [XPath tests 881]
+    expected: FAIL
+
+  [XPath tests 882]
+    expected: FAIL
+
+  [XPath tests 883]
+    expected: FAIL
+
+  [XPath tests 884]
+    expected: FAIL
+
+  [XPath tests 885]
+    expected: FAIL
+
+  [XPath tests 886]
+    expected: FAIL
+
+  [XPath tests 887]
+    expected: FAIL
+
+  [XPath tests 888]
+    expected: FAIL
+
+  [XPath tests 889]
+    expected: FAIL
+
+  [XPath tests 890]
+    expected: FAIL
+
+  [XPath tests 891]
+    expected: FAIL
+
+  [XPath tests 892]
+    expected: FAIL
+
+  [XPath tests 893]
+    expected: FAIL
+
+  [XPath tests 894]
+    expected: FAIL
+
+  [XPath tests 895]
+    expected: FAIL
+
+  [XPath tests 896]
+    expected: FAIL
+
+  [XPath tests 897]
+    expected: FAIL
+
+  [XPath tests 898]
+    expected: FAIL
+
+  [XPath tests 899]
+    expected: FAIL
+
+  [XPath tests 900]
+    expected: FAIL
+
+  [XPath tests 901]
+    expected: FAIL
+
+  [XPath tests 902]
+    expected: FAIL
+
+  [XPath tests 903]
+    expected: FAIL
+
+  [XPath tests 904]
+    expected: FAIL
+
+  [XPath tests 905]
+    expected: FAIL
+
+  [XPath tests 906]
+    expected: FAIL
+
+  [XPath tests 907]
+    expected: FAIL
+
+  [XPath tests 908]
+    expected: FAIL
+
+  [XPath tests 909]
+    expected: FAIL
+
+  [XPath tests 910]
+    expected: FAIL
+
+  [XPath tests 911]
+    expected: FAIL
+
+  [XPath tests 912]
+    expected: FAIL
+
+  [XPath tests 913]
+    expected: FAIL
+
+  [XPath tests 914]
+    expected: FAIL
+
+  [XPath tests 915]
+    expected: FAIL
+
+  [XPath tests 916]
+    expected: FAIL
+
+  [XPath tests 917]
+    expected: FAIL
+
+  [XPath tests 918]
+    expected: FAIL
+
+  [XPath tests 919]
+    expected: FAIL
+
+  [XPath tests 920]
+    expected: FAIL
+
+  [XPath tests 921]
+    expected: FAIL
+
+  [XPath tests 922]
+    expected: FAIL
+
+  [XPath tests 923]
+    expected: FAIL
+
+  [XPath tests 924]
+    expected: FAIL
+
+  [XPath tests 925]
+    expected: FAIL
+
+  [XPath tests 926]
+    expected: FAIL
+
+  [XPath tests 927]
+    expected: FAIL
+
+  [XPath tests 928]
+    expected: FAIL
+
+  [XPath tests 929]
+    expected: FAIL
+
+  [XPath tests 930]
+    expected: FAIL
+
+  [XPath tests 931]
+    expected: FAIL
+
+  [XPath tests 932]
+    expected: FAIL
+
+  [XPath tests 933]
+    expected: FAIL
+
+  [XPath tests 934]
+    expected: FAIL
+
+  [XPath tests 935]
+    expected: FAIL
+
+  [XPath tests 936]
+    expected: FAIL
+
+  [XPath tests 937]
+    expected: FAIL
+
+  [XPath tests 938]
+    expected: FAIL
+
+  [XPath tests 939]
+    expected: FAIL
+
+  [XPath tests 940]
+    expected: FAIL
+
+  [XPath tests 941]
+    expected: FAIL
+
+  [XPath tests 942]
+    expected: FAIL
+
+  [XPath tests 943]
+    expected: FAIL
+
+  [XPath tests 944]
+    expected: FAIL
+
+  [XPath tests 945]
+    expected: FAIL
+
+  [XPath tests 946]
+    expected: FAIL
+
+  [XPath tests 947]
+    expected: FAIL
+
+  [XPath tests 948]
+    expected: FAIL
+
+  [XPath tests 949]
+    expected: FAIL
+
+  [XPath tests 950]
+    expected: FAIL
+
+  [XPath tests 951]
+    expected: FAIL
+
+  [XPath tests 952]
+    expected: FAIL
+
+  [XPath tests 953]
+    expected: FAIL
+
+  [XPath tests 954]
+    expected: FAIL
+
+  [XPath tests 955]
+    expected: FAIL
+
+  [XPath tests 956]
+    expected: FAIL
+
+  [XPath tests 957]
+    expected: FAIL
+
+  [XPath tests 958]
+    expected: FAIL
+
+  [XPath tests 959]
+    expected: FAIL
+
+  [XPath tests 960]
+    expected: FAIL
+
+  [XPath tests 961]
+    expected: FAIL
+
+  [XPath tests 962]
+    expected: FAIL
+
+  [XPath tests 963]
+    expected: FAIL
+
+  [XPath tests 964]
+    expected: FAIL
+
+  [XPath tests 965]
+    expected: FAIL
+
+  [XPath tests 966]
+    expected: FAIL
+
+  [XPath tests 967]
+    expected: FAIL
+
+  [XPath tests 968]
+    expected: FAIL
+
+  [XPath tests 969]
+    expected: FAIL
+
+  [XPath tests 970]
+    expected: FAIL
+
+  [XPath tests 971]
+    expected: FAIL
+
+  [XPath tests 972]
+    expected: FAIL
+
+  [XPath tests 973]
+    expected: FAIL
+
+  [XPath tests 974]
+    expected: FAIL
+
+  [XPath tests 975]
+    expected: FAIL
+
+  [XPath tests 976]
+    expected: FAIL
+
+  [XPath tests 977]
+    expected: FAIL
+
+  [XPath tests 978]
+    expected: FAIL
+
+  [XPath tests 979]
+    expected: FAIL
+
+  [XPath tests 980]
+    expected: FAIL
+
+  [XPath tests 981]
+    expected: FAIL
+
+  [XPath tests 982]
+    expected: FAIL
+
+  [XPath tests 983]
+    expected: FAIL
+
+  [XPath tests 984]
+    expected: FAIL
+
+  [XPath tests 985]
+    expected: FAIL
+
+  [XPath tests 986]
+    expected: FAIL
+
+  [XPath tests 987]
+    expected: FAIL
+
+  [XPath tests 988]
+    expected: FAIL
+
+  [XPath tests 989]
+    expected: FAIL
+
+  [XPath tests 990]
+    expected: FAIL
+
+  [XPath tests 991]
+    expected: FAIL
+
+  [XPath tests 992]
+    expected: FAIL
+
+  [XPath tests 993]
+    expected: FAIL
+
+  [XPath tests 994]
+    expected: FAIL
+
+  [XPath tests 995]
+    expected: FAIL
+
+  [XPath tests 996]
+    expected: FAIL
+
+  [XPath tests 997]
+    expected: FAIL
+
+  [XPath tests 998]
+    expected: FAIL
+
+  [XPath tests 999]
+    expected: FAIL
+
+  [XPath tests 1000]
+    expected: FAIL
+
+  [XPath tests 1001]
+    expected: FAIL
+
+  [XPath tests 1002]
+    expected: FAIL
+
+  [XPath tests 1003]
+    expected: FAIL
+
+  [XPath tests 1004]
+    expected: FAIL
+
+  [XPath tests 1005]
+    expected: FAIL
+
+  [XPath tests 1006]
+    expected: FAIL
+
+  [XPath tests 1007]
+    expected: FAIL
+
+  [XPath tests 1008]
+    expected: FAIL
+
+  [XPath tests 1009]
+    expected: FAIL
+
+  [XPath tests 1010]
+    expected: FAIL
+
+  [XPath tests 1011]
+    expected: FAIL
+
+  [XPath tests 1012]
+    expected: FAIL
+
+  [XPath tests 1013]
+    expected: FAIL
+
+  [XPath tests 1014]
+    expected: FAIL
+
+  [XPath tests 1015]
+    expected: FAIL
+
+  [XPath tests 1016]
+    expected: FAIL
+
+  [XPath tests 1017]
+    expected: FAIL
+
+  [XPath tests 1018]
+    expected: FAIL
+
+  [XPath tests 1019]
+    expected: FAIL
+
+  [XPath tests 1020]
+    expected: FAIL
+
+  [XPath tests 1021]
+    expected: FAIL
+
+  [XPath tests 1022]
+    expected: FAIL
+
+  [XPath tests 1023]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/domxpath/xpathevaluatorbase-creatensresolver.html.ini b/tests/wpt/meta-legacy-layout/domxpath/xpathevaluatorbase-creatensresolver.html.ini
new file mode 100644
index 00000000000..54af72fd188
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/domxpath/xpathevaluatorbase-creatensresolver.html.ini
@@ -0,0 +1,2 @@
+[xpathevaluatorbase-creatensresolver.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/fetch/api/redirect/redirect-back-to-original-origin.any.js.ini b/tests/wpt/meta-legacy-layout/fetch/api/redirect/redirect-back-to-original-origin.any.js.ini
index 3d5d73bf245..ab0e364400b 100644
--- a/tests/wpt/meta-legacy-layout/fetch/api/redirect/redirect-back-to-original-origin.any.js.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/api/redirect/redirect-back-to-original-origin.any.js.ini
@@ -1,12 +1,6 @@
 [redirect-back-to-original-origin.any.html]
-  [original => remote => original with mode: "no-cors"]
-    expected: FAIL
-
 
 [redirect-back-to-original-origin.any.worker.html]
-  [original => remote => original with mode: "no-cors"]
-    expected: FAIL
-
   [redirect-back-to-original-origin]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/fetch/images/canvas-remote-read-remote-image-redirect.html.ini b/tests/wpt/meta-legacy-layout/fetch/images/canvas-remote-read-remote-image-redirect.html.ini
deleted file mode 100644
index 33630ce7eba..00000000000
--- a/tests/wpt/meta-legacy-layout/fetch/images/canvas-remote-read-remote-image-redirect.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[canvas-remote-read-remote-image-redirect.html]
-  [Load a no-cors image from a same-origin URL that redirects to a cross-origin URL that redirects to the initial origin]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-font-face.https.sub.tentative.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-font-face.https.sub.tentative.html.ini
index f2eb0d19401..e7aa2fd885e 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-font-face.https.sub.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-font-face.https.sub.tentative.html.ini
@@ -49,3 +49,6 @@
 
   [sec-fetch-user]
     expected: FAIL
+
+  [sec-fetch-storage-access - Same site]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-font-face.sub.tentative.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-font-face.sub.tentative.html.ini
index 7c8f075e3b4..5d2b63f12d3 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-font-face.sub.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-font-face.sub.tentative.html.ini
@@ -31,3 +31,9 @@
 
   [sec-fetch-dest - Not sent to non-trustworthy same-site destination]
     expected: FAIL
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: FAIL
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.https.sub.tentative.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.https.sub.tentative.html.ini
index 4ec27c8b8aa..5832fa29dbf 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.https.sub.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.https.sub.tentative.html.ini
@@ -245,3 +245,27 @@
 
   [list-style-image sec-fetch-user]
     expected: FAIL
+
+  [background-image sec-fetch-storage-access - Cross-site]
+    expected: TIMEOUT
+
+  [border-image sec-fetch-storage-access - Cross-site]
+    expected: FAIL
+
+  [content sec-fetch-storage-access - Cross-site]
+    expected: FAIL
+
+  [cursor sec-fetch-storage-access - Cross-site]
+    expected: FAIL
+
+  [list-style-image sec-fetch-storage-access - Cross-site]
+    expected: FAIL
+
+  [content sec-fetch-storage-access - Same site]
+    expected: FAIL
+
+  [cursor sec-fetch-storage-access - Same site]
+    expected: FAIL
+
+  [list-style-image sec-fetch-storage-access - Same site]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.sub.tentative.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.sub.tentative.html.ini
index 741af78eff8..1eea0d07086 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.sub.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/css-images.sub.tentative.html.ini
@@ -152,3 +152,30 @@
 
   [border-image sec-fetch-site - HTTPS downgrade (header not sent)]
     expected: FAIL
+
+  [content sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: FAIL
+
+  [cursor sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: FAIL
+
+  [list-style-image sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: FAIL
+
+  [content sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: FAIL
+
+  [cursor sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: FAIL
+
+  [list-style-image sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: FAIL
+
+  [content sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: FAIL
+
+  [cursor sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: FAIL
+
+  [list-style-image sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-area.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-area.sub.html.ini
index a82f7428f6a..171d4b1e282 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-area.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-area.sub.html.ini
@@ -44,3 +44,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade - no attributes]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - no attributes]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-audio.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-audio.https.sub.html.ini
index 03e98a8db48..5ccc5d709f8 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-audio.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-audio.https.sub.html.ini
@@ -22,3 +22,6 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade, no attributes]
     expected: FAIL
+
+  [sec-fetch-storage-access - Cross-site, no attributes]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-embed.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-embed.https.sub.html.ini
index a61ffa1463c..7018dd4d39b 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-embed.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-embed.https.sub.html.ini
@@ -50,3 +50,9 @@
 
   [sec-fetch-user]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-embed.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-embed.sub.html.ini
index 1afa0345596..a0b0278dbd5 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-embed.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-embed.sub.html.ini
@@ -44,3 +44,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-frame.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-frame.sub.html.ini
index 94bf6c786c3..135cef9edf4 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-frame.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-frame.sub.html.ini
@@ -44,3 +44,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-img-environment-change.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-img-environment-change.https.sub.html.ini
index d2e9de30b09..32c99b5d236 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-img-environment-change.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-img-environment-change.https.sub.html.ini
@@ -1,37 +1,37 @@
 [element-img-environment-change.https.sub.html]
   expected: TIMEOUT
   [sec-fetch-site - Same origin, no attributes]
-    expected: TIMEOUT
+    expected: FAIL
 
   [sec-fetch-site - Cross-site, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same site, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Cross-Site -> Same-Origin redirect, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Same-Site -> Same-Origin redirect, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Cross-Site -> Same Origin, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Cross-Site -> Same-Site, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Cross-Site -> Cross-Site, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Same Origin, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Same-Site, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Cross-Site, no attributes]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [sec-fetch-site - Same-Site -> Same Origin, no attributes]
     expected: NOTRUN
@@ -59,3 +59,9 @@
 
   [sec-fetch-user - no attributes]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site, no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site, no attributes]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-img-environment-change.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-img-environment-change.sub.html.ini
index ac557773191..b05478bf6b3 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-img-environment-change.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-img-environment-change.sub.html.ini
@@ -1,46 +1,54 @@
 [element-img-environment-change.sub.html]
-  expected: TIMEOUT
   [sec-fetch-site - Not sent to non-trustworthy same-origin destination, no attributes]
-    expected: TIMEOUT
+    expected: FAIL
 
   [sec-fetch-site - Not sent to non-trustworthy same-site destination, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Not sent to non-trustworthy cross-site destination, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-mode - Not sent to non-trustworthy same-origin destination, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-mode - Not sent to non-trustworthy same-site destination, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-mode - Not sent to non-trustworthy cross-site destination, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-dest - Not sent to non-trustworthy same-origin destination, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-dest - Not sent to non-trustworthy same-site destination, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-dest - Not sent to non-trustworthy cross-site destination, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-user - Not sent to non-trustworthy same-origin destination, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-user - Not sent to non-trustworthy same-site destination, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-user - Not sent to non-trustworthy cross-site destination, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - HTTPS downgrade (header not sent), no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - HTTPS upgrade, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - HTTPS downgrade-upgrade, no attributes]
-    expected: NOTRUN
+    expected: FAIL
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination, no attributes]
+    expected: FAIL
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination, no attributes]
+    expected: FAIL
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination, no attributes]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-img.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-img.https.sub.html.ini
index a42697b3dc8..a0fe191d526 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-img.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-img.https.sub.html.ini
@@ -43,3 +43,9 @@
 
   [sec-fetch-site - src - HTTPS downgrade-upgrade, no attributes]
     expected: FAIL
+
+  [sec-fetch-storage-access - src - Cross-site, no attributes]
+    expected: FAIL
+
+  [sec-fetch-storage-access - srcset - Cross-site, no attributes]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-input-image.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-input-image.https.sub.html.ini
index f749f3403a6..b9b58f62c92 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-input-image.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-input-image.https.sub.html.ini
@@ -53,3 +53,9 @@
 
   [sec-fetch-user - no attributes]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site, no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site, no attributes]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-input-image.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-input-image.sub.html.ini
index 59c416c96c0..4141f644642 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-input-image.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-input-image.sub.html.ini
@@ -44,3 +44,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade, no attributes]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination, no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination, no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination, no attributes]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-link-icon.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-link-icon.https.sub.html.ini
index 1497c8d2770..413df63e004 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-link-icon.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-link-icon.https.sub.html.ini
@@ -59,3 +59,9 @@
 
   [sec-fetch-user no attributes]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site no attributes]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-link-icon.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-link-icon.sub.html.ini
index e2e601ee012..da5d7731a74 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-link-icon.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-link-icon.sub.html.ini
@@ -44,3 +44,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade no attributes]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination no attributes]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-link-prefetch.https.optional.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-link-prefetch.https.optional.sub.html.ini
index a1d357e629e..ccb5ced4fc0 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-link-prefetch.https.optional.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-link-prefetch.https.optional.sub.html.ini
@@ -61,3 +61,6 @@
 
   [sec-fetch-dest attributes: as=worker]
     expected: FAIL
+
+  [sec-fetch-storage-access - Cross-site no attributes]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-picture.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-picture.https.sub.html.ini
index 4d9dbae345e..54ada6e7d20 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-picture.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-picture.https.sub.html.ini
@@ -64,3 +64,12 @@
 
   [sec-fetch-mode - img[src\] - attributes: crossorigin=anonymous]
     expected: FAIL
+
+  [sec-fetch-storage-access - img[src\] - Cross-site, no attributes]
+    expected: FAIL
+
+  [sec-fetch-storage-access - img[srcset\] - Cross-site, no attributes]
+    expected: FAIL
+
+  [sec-fetch-storage-access - source[srcset\] - Cross-site, no attributes]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-script.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-script.https.sub.html.ini
index 217a1c62e79..1d1e07b42e1 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-script.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-script.https.sub.html.ini
@@ -40,3 +40,6 @@
 
   [sec-fetch-site - Same-Site -> Cross-Site, attributes: type=module]
     expected: FAIL
+
+  [sec-fetch-storage-access - Cross-site, no attributes]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-video-poster.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-video-poster.https.sub.html.ini
index 8a8a1dcb679..dc51438cbf9 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-video-poster.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-video-poster.https.sub.html.ini
@@ -53,3 +53,9 @@
 
   [sec-fetch-user]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-video-poster.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-video-poster.sub.html.ini
index d711f12d397..689ce52960e 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-video-poster.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-video-poster.sub.html.ini
@@ -44,3 +44,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-video.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-video.https.sub.html.ini
index 2978eb8f94f..95d4ed00243 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-video.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/element-video.https.sub.html.ini
@@ -22,3 +22,6 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade, no attributes]
     expected: FAIL
+
+  [sec-fetch-storage-access - Cross-site, no attributes]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/fetch-via-serviceworker.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/fetch-via-serviceworker.https.sub.html.ini
index 35a5acda9c7..bf61a3677b7 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/fetch-via-serviceworker.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/fetch-via-serviceworker.https.sub.html.ini
@@ -118,3 +118,15 @@
 
   [sec-fetch-user - no init - fallback]
     expected: FAIL
+
+  [sec-fetch-storage-access - Cross-site, init: mode=no-cors, credentials=include - respondWith]
+    expected: FAIL
+
+  [sec-fetch-storage-access - Cross-site, init: mode=no-cors, credentials=include - fallback]
+    expected: FAIL
+
+  [sec-fetch-storage-access - Same site, init: mode=no-cors, credentials=include - respondWith]
+    expected: FAIL
+
+  [sec-fetch-storage-access - Same site, init: mode=no-cors, credentials=include - fallback]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/fetch.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/fetch.https.sub.html.ini
index 6153b15aec8..7b9d1002ec9 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/fetch.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/fetch.https.sub.html.ini
@@ -19,3 +19,6 @@
 
   [sec-fetch-site - Same-Site -> Cross-Site, init: mode=no-cors]
     expected: FAIL
+
+  [sec-fetch-storage-access - Cross-site, init: mode=no-cors, credentials=include]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/form-submission.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/form-submission.sub.html.ini
index 4841ed06a03..b7215d66629 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/form-submission.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/form-submission.sub.html.ini
@@ -89,3 +89,21 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade - POST]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - GET]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - POST]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - GET]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - POST]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - GET]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - POST]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/header-link.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/header-link.https.sub.html.ini
index 6346c6dbf6c..757e542f956 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/header-link.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/header-link.https.sub.html.ini
@@ -97,3 +97,15 @@
 
   [sec-fetch-user rel=stylesheet]
     expected: FAIL
+
+  [sec-fetch-storage-access rel=icon - Cross-site]
+    expected: FAIL
+
+  [sec-fetch-storage-access rel=stylesheet - Cross-site]
+    expected: FAIL
+
+  [sec-fetch-storage-access rel=icon - Same site]
+    expected: FAIL
+
+  [sec-fetch-storage-access rel=stylesheet - Same site]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/header-link.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/header-link.sub.html.ini
index cb3931b0d7a..9da74977965 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/header-link.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/header-link.sub.html.ini
@@ -88,3 +88,21 @@
 
   [sec-fetch-site rel=stylesheet - HTTPS downgrade-upgrade]
     expected: FAIL
+
+  [sec-fetch-storage-access rel=icon - Not sent to non-trustworthy same-origin destination]
+    expected: FAIL
+
+  [sec-fetch-storage-access rel=stylesheet - Not sent to non-trustworthy same-origin destination]
+    expected: FAIL
+
+  [sec-fetch-storage-access rel=icon - Not sent to non-trustworthy same-site destination]
+    expected: FAIL
+
+  [sec-fetch-storage-access rel=stylesheet - Not sent to non-trustworthy same-site destination]
+    expected: FAIL
+
+  [sec-fetch-storage-access rel=icon - Not sent to non-trustworthy cross-site destination]
+    expected: FAIL
+
+  [sec-fetch-storage-access rel=stylesheet - Not sent to non-trustworthy cross-site destination]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/header-refresh.https.optional.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/header-refresh.https.optional.sub.html.ini
index 1977a28c32b..b4aa17447bc 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/header-refresh.https.optional.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/header-refresh.https.optional.sub.html.ini
@@ -53,3 +53,9 @@
 
   [sec-fetch-user]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/header-refresh.optional.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/header-refresh.optional.sub.html.ini
index 33ce93d57e8..deb8331cdf8 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/header-refresh.optional.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/header-refresh.optional.sub.html.ini
@@ -44,3 +44,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/svg-image.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/svg-image.https.sub.html.ini
index fc5f1de1d19..5d85add7f82 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/svg-image.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/svg-image.https.sub.html.ini
@@ -62,3 +62,9 @@
 
   [sec-fetch-user no attributes]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site no attributes]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/svg-image.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/svg-image.sub.html.ini
index c563b49ee04..dc3a74db79c 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/svg-image.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/svg-image.sub.html.ini
@@ -44,3 +44,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade no attributes]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination no attributes]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/window-history.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/window-history.https.sub.html.ini
index 40416da6081..c92712ae95b 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/window-history.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/window-history.https.sub.html.ini
@@ -35,3 +35,15 @@
 
   [sec-fetch-user - history.forward]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site - history.back]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site - history.forward]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site - history.back]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site - history.forward]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/window-history.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/window-history.sub.html.ini
index 9752bedb009..24992408164 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/window-history.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/window-history.sub.html.ini
@@ -71,3 +71,21 @@
 
   [sec-fetch-user - Not sent to non-trustworthy cross-site destination - history.forward]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - history.back]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - history.forward]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - history.back]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - history.forward]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - history.back]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - history.forward]
+    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/worker-dedicated-importscripts.https.sub.html.ini b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/worker-dedicated-importscripts.https.sub.html.ini
index c4c3f669fe2..c1e2dd8e89c 100644
--- a/tests/wpt/meta-legacy-layout/fetch/metadata/generated/worker-dedicated-importscripts.https.sub.html.ini
+++ b/tests/wpt/meta-legacy-layout/fetch/metadata/generated/worker-dedicated-importscripts.https.sub.html.ini
@@ -19,3 +19,6 @@
 
   [sec-fetch-site - Same-Site -> Cross-Site]
     expected: FAIL
+
+  [sec-fetch-storage-access - Cross-site]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
index 277436ffad2..530635e744f 100644
--- a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/initial-empty-document/iframe-src-aboutblank-navigate-immediately.html.ini
@@ -1,3 +1,6 @@
 [iframe-src-aboutblank-navigate-immediately.html]
   [Navigating to a different document with window.open]
     expected: FAIL
+
+  [Navigating to a different document with link click]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
new file mode 100644
index 00000000000..7dc346632a4
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin.window.js.ini
@@ -0,0 +1,3 @@
+[navigation-unload-same-origin.window.html]
+  [Same-origin navigation started from unload handler must be ignored]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/refresh/same-document-refresh.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/refresh/same-document-refresh.html.ini
new file mode 100644
index 00000000000..d55bacae6b4
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/html/browsers/browsing-the-web/navigating-across-documents/refresh/same-document-refresh.html.ini
@@ -0,0 +1,3 @@
+[same-document-refresh.html]
+  [Same-Document Referrer from Refresh]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/meta-legacy-layout/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 558ce5dcaa5..2c2e5d84e88 100644
--- a/tests/wpt/meta-legacy-layout/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -4,6 +4,3 @@
 
   [opener of discarded nested browsing context]
     expected: FAIL
-
-  [opener of discarded auxiliary browsing context]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
index 751ca58fa7e..dc8137a3a4e 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
@@ -1,3 +1,2 @@
 [2d.text.measure.caret-position-edge-cases.tentative.html]
-  [Test the edge cases for caretPositionFromPoint, where the point is at the edge of glyph and at the midpoint.]
-    expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position-edges.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position-edges.tentative.html.ini
index a8f84833ae9..c1d026a098f 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position-edges.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position-edges.tentative.html.ini
@@ -1,30 +1,2 @@
 [2d.text.measure.caret-position-edges.tentative.html]
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align left.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align left.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align center.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align center.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align right.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align right.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align start.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align start.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align end.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align end.]
-    expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position.tentative.html.ini
index 2b7dea3b3b2..51ffef6397a 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/element/text/2d.text.measure.caret-position.tentative.html.ini
@@ -1,120 +1,2 @@
 [2d.text.measure.caret-position.tentative.html]
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and directional-override.]
-    expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
index 751ca58fa7e..dc8137a3a4e 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
@@ -1,3 +1,2 @@
 [2d.text.measure.caret-position-edge-cases.tentative.html]
-  [Test the edge cases for caretPositionFromPoint, where the point is at the edge of glyph and at the midpoint.]
-    expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.js.ini
index 5d4cad8801f..074dbcf4af4 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.js.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.js.ini
@@ -1,3 +1,2 @@
 [2d.text.measure.caret-position-edge-cases.tentative.worker.html]
-  [Test the edge cases for caretPositionFromPoint, where the point is at the edge of glyph and at the midpoint.]
-    expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.html.ini
index a8f84833ae9..c1d026a098f 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.html.ini
@@ -1,30 +1,2 @@
 [2d.text.measure.caret-position-edges.tentative.html]
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align left.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align left.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align center.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align center.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align right.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align right.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align start.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align start.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align end.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align end.]
-    expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.worker.js.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.worker.js.ini
index 08ebd3f82f7..0133a89a2ff 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.worker.js.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.worker.js.ini
@@ -1,30 +1,2 @@
 [2d.text.measure.caret-position-edges.tentative.worker.html]
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align left.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align left.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align center.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align center.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align right.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align right.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align start.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align start.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align end.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align end.]
-    expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position.tentative.html.ini b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position.tentative.html.ini
index 2b7dea3b3b2..51ffef6397a 100644
--- a/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position.tentative.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/canvas/offscreen/text/2d.text.measure.caret-position.tentative.html.ini
@@ -1,120 +1,2 @@
 [2d.text.measure.caret-position.tentative.html]
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and directional-override.]
-    expected: FAIL
+  expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/html/dom/idlharness.https.html.ini b/tests/wpt/meta-legacy-layout/html/dom/idlharness.https.html.ini
index 4addb4d0e8b..4aa7fd4d9ff 100644
--- a/tests/wpt/meta-legacy-layout/html/dom/idlharness.https.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/dom/idlharness.https.html.ini
@@ -7189,9 +7189,6 @@
   [HTMLIFrameElement interface: attribute allow]
     expected: FAIL
 
-  [HTMLIFrameElement interface: attribute referrerPolicy]
-    expected: FAIL
-
   [HTMLIFrameElement interface: attribute loading]
     expected: FAIL
 
@@ -7219,9 +7216,6 @@
   [HTMLIFrameElement interface: document.createElement("iframe") must inherit property "allow" with the proper type]
     expected: FAIL
 
-  [HTMLIFrameElement interface: document.createElement("iframe") must inherit property "referrerPolicy" with the proper type]
-    expected: FAIL
-
   [HTMLIFrameElement interface: document.createElement("iframe") must inherit property "loading" with the proper type]
     expected: FAIL
 
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-nav-link-click.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-nav-link-click.html.ini
deleted file mode 100644
index c39ecacf165..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-nav-link-click.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[iframe-loading-lazy-nav-link-click.html]
-  [Navigating iframe loading='lazy' before it is loaded: link click]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index 841bafc6eca..26704422bbe 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,3 +1,4 @@
 [iframe_sandbox_popups_escaping-2.html]
+  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/meta-legacy-layout/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
index 8003fce097c..19d256f6e77 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
@@ -1,13 +1,14 @@
 [viewport-change.html]
   type: testharness
+  expected: TIMEOUT
   [picture: source (max-width:500px) broken image, img valid image, resize to wide]
-    expected: FAIL
+    expected: TIMEOUT
 
   [picture: source (max-width:500px) valid image, img valid image, resize to wide]
     expected: FAIL
 
   [picture: source (max-width:500px) valid image, img broken image, resize to narrow]
-    expected: FAIL
+    expected: TIMEOUT
 
   [picture: source (max-width:500px) valid image, img valid image, resize to narrow]
     expected: FAIL
@@ -23,3 +24,9 @@
 
   [picture: same URL in source (max-width:500px) and img, resize to narrow]
     expected: FAIL
+
+  [picture: source (max-width:500px) valid image, img broken image, resize to wide]
+    expected: FAIL
+
+  [picture: source (max-width:500px) broken image, img valid image, resize to narrow]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-input-element/input-form-detach-style-crash.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/forms/the-input-element/input-form-detach-style-crash.html.ini
deleted file mode 100644
index 0c0b0de0604..00000000000
--- a/tests/wpt/meta-legacy-layout/html/semantics/forms/the-input-element/input-form-detach-style-crash.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[input-form-detach-style-crash.html]
-  expected: CRASH
diff --git a/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-minimum-role.html.ini b/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-minimum-role.html.ini
index 1ae0c3961a0..27028cd5515 100644
--- a/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-minimum-role.html.ini
+++ b/tests/wpt/meta-legacy-layout/html/semantics/popovers/popover-minimum-role.html.ini
@@ -4,3 +4,6 @@
 
   [Dynamic changes to popover attribute should change the role.]
     expected: FAIL
+
+  [The popover attribute, on an element with no implicit role, then the element's role instead maps to group.]
+    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/meta-legacy-layout/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index 53acb938c1b..00000000000
--- a/tests/wpt/meta-legacy-layout/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/html/webappapis/update-rendering/child-document-raf-order.html.ini b/tests/wpt/meta-legacy-layout/html/webappapis/update-rendering/child-document-raf-order.html.ini
deleted file mode 100644
index 312c6689170..00000000000
--- a/tests/wpt/meta-legacy-layout/html/webappapis/update-rendering/child-document-raf-order.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[child-document-raf-order.html]
-  [Ordering of steps in "Update the Rendering" - child document requestAnimationFrame order]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/navigation-timing/nav2-test-timing-persistent.html.ini b/tests/wpt/meta-legacy-layout/navigation-timing/nav2-test-timing-persistent.html.ini
index cd795880253..52e1faeed9c 100644
--- a/tests/wpt/meta-legacy-layout/navigation-timing/nav2-test-timing-persistent.html.ini
+++ b/tests/wpt/meta-legacy-layout/navigation-timing/nav2-test-timing-persistent.html.ini
@@ -1,3 +1,10 @@
 [nav2-test-timing-persistent.html]
+  expected: TIMEOUT
   [iframe navigation times are persistent after the iframe is removed.]
     expected: FAIL
+
+  [iframe navigation times are persistent after the iframe is removed. Part 1.]
+    expected: FAIL
+
+  [iframe navigation times are persistent after the iframe is removed Part 2.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html.ini b/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html.ini
deleted file mode 100644
index d765d5496ca..00000000000
--- a/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/no-referrer/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[iframe-tag.http.html]
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 8c461943293..00000000000
--- a/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-[iframe-tag.http.html]
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/origin/iframe-tag.http.html.ini b/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/origin/iframe-tag.http.html.ini
deleted file mode 100644
index c9fb6af9170..00000000000
--- a/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-[iframe-tag.http.html]
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html.ini b/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html.ini
deleted file mode 100644
index da98c96c506..00000000000
--- a/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/same-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,24 +0,0 @@
-[iframe-tag.http.html]
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html.ini b/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html.ini
deleted file mode 100644
index 8c461943293..00000000000
--- a/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-[iframe-tag.http.html]
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html.ini b/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html.ini
deleted file mode 100644
index c9fb6af9170..00000000000
--- a/tests/wpt/meta-legacy-layout/referrer-policy/gen/req.attr/strict-origin/iframe-tag.http.html.ini
+++ /dev/null
@@ -1,36 +0,0 @@
-[iframe-tag.http.html]
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.]
-    expected: FAIL
-
-  [Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/referrer-policy/generic/iframe-src-change.html.ini b/tests/wpt/meta-legacy-layout/referrer-policy/generic/iframe-src-change.html.ini
deleted file mode 100644
index 255b8ba2def..00000000000
--- a/tests/wpt/meta-legacy-layout/referrer-policy/generic/iframe-src-change.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[iframe-src-change.html]
-  [Checks that referrerpolicy is respected when an iframe's src changes.]
-    expected: FAIL
-
diff --git a/tests/wpt/meta-legacy-layout/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/meta-legacy-layout/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/meta-legacy-layout/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/meta-legacy-layout/xhr/open-url-multi-window-5.htm.ini b/tests/wpt/meta-legacy-layout/xhr/open-url-multi-window-5.htm.ini
deleted file mode 100644
index 5c5d36a6bf2..00000000000
--- a/tests/wpt/meta-legacy-layout/xhr/open-url-multi-window-5.htm.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[open-url-multi-window-5.htm]
-  [XMLHttpRequest: open() resolving URLs (multi-Window; 5)]
-    expected: FAIL
diff --git a/tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html.ini b/tests/wpt/meta/FileAPI/BlobURL/cross-partition-navigation.https.html.ini
similarity index 69%
rename from tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html.ini
rename to tests/wpt/meta/FileAPI/BlobURL/cross-partition-navigation.https.html.ini
index 348eebd4eed..3c7c17746a5 100644
--- a/tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html.ini
+++ b/tests/wpt/meta/FileAPI/BlobURL/cross-partition-navigation.https.html.ini
@@ -1,8 +1,5 @@
-[cross-partition-navigation.tentative.https.html]
+[cross-partition-navigation.https.html]
   expected: TIMEOUT
-  [Blob URL navigation should enforce noopener for a cross-top-level-site navigation]
-    expected: FAIL
-
   [Blob URL window.open should enforce noopener for a cross-top-level-site navigation]
     expected: FAIL
 
diff --git a/tests/wpt/meta/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html.ini b/tests/wpt/meta/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html.ini
deleted file mode 100644
index 348eebd4eed..00000000000
--- a/tests/wpt/meta/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html.ini
+++ /dev/null
@@ -1,13 +0,0 @@
-[cross-partition-navigation.tentative.https.html]
-  expected: TIMEOUT
-  [Blob URL navigation should enforce noopener for a cross-top-level-site navigation]
-    expected: FAIL
-
-  [Blob URL window.open should enforce noopener for a cross-top-level-site navigation]
-    expected: FAIL
-
-  [Blob URL link click should enforce noopener for a cross-top-level-site navigation]
-    expected: FAIL
-
-  [Blob URL area element click should enforce noopener for a cross-top-level-site navigation]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html.ini b/tests/wpt/meta/FileAPI/BlobURL/cross-partition-worker-creation.https.html.ini
similarity index 79%
rename from tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html.ini
rename to tests/wpt/meta/FileAPI/BlobURL/cross-partition-worker-creation.https.html.ini
index 54f0dbef7d1..cb5e3578d72 100644
--- a/tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html.ini
+++ b/tests/wpt/meta/FileAPI/BlobURL/cross-partition-worker-creation.https.html.ini
@@ -1,4 +1,4 @@
-[cross-partition-worker-creation.tentative.https.html]
+[cross-partition-worker-creation.https.html]
   expected: TIMEOUT
   [Cross-partition Shared worker shouldn't be created from blob URL.]
     expected: TIMEOUT
diff --git a/tests/wpt/meta/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html.ini b/tests/wpt/meta/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html.ini
deleted file mode 100644
index 54f0dbef7d1..00000000000
--- a/tests/wpt/meta/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[cross-partition-worker-creation.tentative.https.html]
-  expected: TIMEOUT
-  [Cross-partition Shared worker shouldn't be created from blob URL.]
-    expected: TIMEOUT
-
-  [Cross-partition Dedicated worker shouldn't be created from blob URL.]
-    expected: NOTRUN
diff --git a/tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition.tentative.https.html.ini b/tests/wpt/meta/FileAPI/BlobURL/cross-partition.https.html.ini
similarity index 95%
rename from tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition.tentative.https.html.ini
rename to tests/wpt/meta/FileAPI/BlobURL/cross-partition.https.html.ini
index eae4d635a80..715a76cc171 100644
--- a/tests/wpt/meta-legacy-layout/FileAPI/BlobURL/cross-partition.tentative.https.html.ini
+++ b/tests/wpt/meta/FileAPI/BlobURL/cross-partition.https.html.ini
@@ -1,4 +1,4 @@
-[cross-partition.tentative.https.html]
+[cross-partition.https.html]
   expected: TIMEOUT
   [Blob URL shouldn't be revocable from a cross-partition iframe]
     expected: FAIL
diff --git a/tests/wpt/meta/FileAPI/BlobURL/cross-partition.tentative.https.html.ini b/tests/wpt/meta/FileAPI/BlobURL/cross-partition.tentative.https.html.ini
deleted file mode 100644
index eae4d635a80..00000000000
--- a/tests/wpt/meta/FileAPI/BlobURL/cross-partition.tentative.https.html.ini
+++ /dev/null
@@ -1,25 +0,0 @@
-[cross-partition.tentative.https.html]
-  expected: TIMEOUT
-  [Blob URL shouldn't be revocable from a cross-partition iframe]
-    expected: FAIL
-
-  [Blob URL shouldn't be revocable from a cross-partition dedicated worker]
-    expected: FAIL
-
-  [Blob URL shouldn't be revocable from a cross-partition shared worker]
-    expected: TIMEOUT
-
-  [Blob URL shouldn't be revocable from a service worker]
-    expected: NOTRUN
-
-  [Blob URL shouldn't be fetched from a cross-partition iframe]
-    expected: NOTRUN
-
-  [Blob URL shouldn't be fetched from a cross-partition dedicated worker]
-    expected: NOTRUN
-
-  [Blob URL shouldn't be fetched from a cross-partition shared worker]
-    expected: NOTRUN
-
-  [Blob URL shouldn't be fetched from a cross-partition service worker]
-    expected: NOTRUN
diff --git a/tests/wpt/meta/MANIFEST.json b/tests/wpt/meta/MANIFEST.json
index a6e971d268a..0b9ffca88eb 100644
--- a/tests/wpt/meta/MANIFEST.json
+++ b/tests/wpt/meta/MANIFEST.json
@@ -4463,6 +4463,13 @@
        ]
       ]
      },
+     "ruby-body-element-crash.html": [
+      "c1487ab6162935bf433fd36752142445e2b2d054",
+      [
+       null,
+       {}
+      ]
+     ],
      "ruby-dynamic-removal-004-crash.html": [
       "be7c28956f6d1b16e734ff34feef5ae3d2648157",
       [
@@ -5429,6 +5436,13 @@
        {}
       ]
      ],
+     "empty-render-target-crash.html": [
+      "38c32b1efb870059b286bde904ff84de68351fc3",
+      [
+       null,
+       {}
+      ]
+     ],
      "get-computed-style-crash.html": [
       "38cd5af7f83d60976f9712e446a55d11fe07160e",
       [
@@ -7016,6 +7030,20 @@
        null,
        {}
       ]
+     ],
+     "chrome-1312699.html": [
+      "c783b0d9cc9634654f59654945a1bdcf38539cc8",
+      [
+       null,
+       {}
+      ]
+     ],
+     "content-visibility-crash.html": [
+      "63111d03e3fab4673ec4d14cff6ad5737fd4f39c",
+      [
+       null,
+       {}
+      ]
      ]
     }
    },
@@ -7848,6 +7876,13 @@
        null,
        {}
       ]
+     ],
+     "testdriver.html": [
+      "24bb1ca19e11c516299d8b7cc6ceae21ec981566",
+      [
+       null,
+       {}
+      ]
      ]
     }
    },
@@ -36674,6 +36709,19 @@
        ],
        {}
       ]
+     ],
+     "testdriver-print.html": [
+      "b4dc6c9760965f812630ea961f52ad16c0ea570e",
+      [
+       null,
+       [
+        [
+         "/infrastructure/reftest/reftest_match-print-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
      ]
     }
    },
@@ -37206,6 +37254,19 @@
       }
      ]
     ],
+    "webkit-box-align-001.html": [
+     "83f095ddd242416c382aca99b7d7b4c03444bfcd",
+     [
+      null,
+      [
+       [
+        "/compat/green-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ],
     "webkit-box-clamp-bottom-border.html": [
      "f133335e79683d5808324e4b2f3559480312f644",
      [
@@ -123926,6 +123987,32 @@
        {}
       ]
      ],
+     "anchor-position-multicol-007.html": [
+      "b8aca1164479d58f0c7c28720362a96d017f5463",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "anchor-position-multicol-008.html": [
+      "f652b6ac2b05d28850f1d732d017cdff9c02e848",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "anchor-position-top-layer-001.html": [
       "f40cc0dccf3ccbef010629ebc809229ba83c9b45",
       [
@@ -168014,6 +168101,19 @@
        {}
       ]
      ],
+     "aspect-ratio-intrinsic-size-010.html": [
+      "7afc53e751e4950d5ebda56ccee30004ece0e38a",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "aspect-ratio-transferred-max-size.html": [
       "3331e5fabef369880f0b5e074fecb6464926ffb8",
       [
@@ -172081,6 +172181,32 @@
        {}
       ]
      ],
+     "flexbox-flex-wrap-flexing-002.html": [
+      "00782f608dd690422fa8575d06fc5c62c772b10b",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "flexbox-flex-wrap-flexing-003.html": [
+      "fb2bd9381268ddb3b4f998fbb13d838302c459e6",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "flexbox-flex-wrap-flexing.html": [
       "b172fe6fbdbb7ec34f0eb88110e8325b2173a1cf",
       [
@@ -187194,6 +187320,32 @@
       ]
      ],
      "grid-definition": {
+      "flex-item-grid-container-auto-repeat-001.html": [
+       "06f87974731af3cf1cf425e8b61cab67a67df024",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "flex-item-grid-container-auto-repeat-002.html": [
+       "e199190be6a545a6ab20d79178b538288ae6ef79",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "flex-item-grid-container-percentage-rows-001.html": [
        "ba655ce8a17d6482071d39e66684b50ebe749822",
        [
@@ -195275,6 +195427,35 @@
         }
        ]
       ],
+      "gradient-single-stop-longer-hue-hsl-002.html": [
+       "da78d6e1cc5ff65867ac506a279accea2af131e3",
+       [
+        null,
+        [
+         [
+          "/css/css-images/gradient/gradient-single-stop-longer-hue-hsl-002-ref.html",
+          "=="
+         ]
+        ],
+        {
+         "fuzzy": [
+          [
+           null,
+           [
+            [
+             0,
+             8
+            ],
+            [
+             0,
+             9050
+            ]
+           ]
+          ]
+         ]
+        }
+       ]
+      ],
       "gradient-single-stop-longer-hue-hsl.html": [
        "bbadccb53e8b0960118cc015255af40597e7c61c",
        [
@@ -218783,6 +218964,19 @@
      ]
     },
     "css-overflow": {
+     "add-scroller-then-scroll-content-into-view.html": [
+      "bbe4ec33c942d74fabf0d8665ce6a69364f256af",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "clip-001.html": [
       "dacb658db6458e67832b454ebd6887a8a04b9349",
       [
@@ -218874,6 +219068,19 @@
        {}
       ]
      ],
+     "content-change-then-scroll-into-view.html": [
+      "ec8836d5cb9558d486a86f7b4fe1ba54dc8726c1",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square.xht",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "display-flex-svg-overflow-default.html": [
       "5fb69d0e09db2205f8c7679775a6a1ec136cbf86",
       [
@@ -220838,6 +221045,19 @@
         {}
        ]
       ],
+      "webkit-line-clamp-abspos-001.html": [
+       "be7798c21195ad6fba0ac543e37d2d7c6d56b995",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "webkit-line-clamp-block-in-inline-001.html": [
        "75d1de3bf5bcf5d00d6980de4a70845e9f7ae8e4",
        [
@@ -230205,6 +230425,99 @@
        {}
       ]
      ],
+     "replaced-elements": {
+      "block-level-canvas-margins-affected-by-block-step-size.html": [
+       "e51a01353532f74dd51d1f47d3cec2c326c66019",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-level-embed-margins-affected-by-block-step-size.html": [
+       "d82f466d08620ffb9852fcd1db36808e878c9774",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-level-iframe-margins-affected-by-block-step-size.html": [
+       "b591b896ab2dfb42c626d5e1145f070ec192547a",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-level-img-margins-affected-by-block-step-size.html": [
+       "d6177987cc97a4697ba1a52a98ca9b44094e97a9",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-level-object-margins-affected-by-block-step-size.html": [
+       "b9a0f0ef4a33df186cc6e3e450d622d90d09b5c8",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-level-svg-margins-affected-by-block-step-size.html": [
+       "cbdabeaff543375bc3d884d67a478201f2ab9892",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-level-video-margins-affected-by-block-step-size.html": [
+       "8d822cfcd5ccac1c86a5bfed9b82f329e90fa06b",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square-only.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ]
+     },
      "zero-outer-size-rounded-up-to-block-step-size.html": [
       "20433b25afd763e9f9ec3b3badc328dd033e0cb2",
       [
@@ -236869,6 +237182,58 @@
      }
     },
     "css-sizing": {
+     "abspos-auto-sizing-fit-content-percentage-001.html": [
+      "b729e6ff7c514db6158fd1958042faf30df77bcd",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "abspos-auto-sizing-fit-content-percentage-002.html": [
+      "856b9607fa246fa9ef47b6745b4ceae88d97858a",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "abspos-auto-sizing-fit-content-percentage-003.html": [
+      "b872ca162b37a2f11c64a4465f91e483f94f01f1",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "abspos-auto-sizing-fit-content-percentage-004.html": [
+      "1d05d96f43104dcc6ceacf4f563f07a488bb91c2",
+      [
+       null,
+       [
+        [
+         "/css/reference/ref-filled-green-100px-square-only.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "aspect-ratio": {
       "abspos-001.html": [
        "e18a0a7c81dbef1b2526793bac31ab6640b33dd7",
@@ -242860,6 +243225,32 @@
         {}
        ]
       ],
+      "block-height-003.tentative.html": [
+       "a469f8d5df2968f8e8ebfb68593563447bf11a10",
+       [
+        null,
+        [
+         [
+          "/css/css-sizing/stretch/block-height-003-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-height-006.tentative.html": [
+       "a25c415b87f5c61fbb037aab55012238bcae55cf",
+       [
+        null,
+        [
+         [
+          "/css/reference/ref-filled-green-100px-square.xht",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "fixed-table-1.html": [
        "ba2df83eac4496e3673b67eee85996880b2438ab",
        [
@@ -298966,7 +299357,7 @@
        ]
       ],
       "chromium-paint-holding-timeout.html": [
-       "83596940fa420005492b38def7e8cd49d0252632",
+       "cb3984695fd4828613fa76f7735db451be3ccb2d",
        [
         null,
         [
@@ -320126,6 +320517,19 @@
        {}
       ]
      ],
+     "fecolormatrix-negative.html": [
+      "eddec862154fc9929a9f7ad8f9cbb0a7d182ef18",
+      [
+       null,
+       [
+        [
+         "/css/filter-effects/fecolormatrix-negative-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "fecolormatrix-type.html": [
       "990225d0113c39f1f3ccd249dfbb11ed28989c47",
       [
@@ -329785,6 +330189,62 @@
      ]
     ]
    },
+   "fullscreen": {
+    "rendering": {
+     "backdrop-iframe.html": [
+      "dbdf9c841a4685160987ed5df0ba5e632b754669",
+      [
+       null,
+       [
+        [
+         "/fullscreen/rendering/backdrop-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "backdrop-inherit.html": [
+      "3a38dc4c815269bcba1fb570c1b0ee1a06ff8b2e",
+      [
+       null,
+       [
+        [
+         "/fullscreen/rendering/backdrop-green-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "backdrop-object.html": [
+      "01dc913a50dddc154f6463e7c2c2fd52f64cc0f7",
+      [
+       null,
+       [
+        [
+         "/fullscreen/rendering/backdrop-object-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "fullscreen-root-fills-page.html": [
+      "e2a6217346db1a4f7850446760f8be43532fa4d2",
+      [
+       null,
+       [
+        [
+         "/fullscreen/rendering/fullscreen-root-fills-page-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ]
+    }
+   },
    "html": {
     "browsers": {
      "sandboxing": {
@@ -342694,6 +343154,35 @@
           {}
          ]
         ],
+        "border-rendering.tentative.html": [
+         "c4025a153a63d1559d83fb6978c7f797bba9b83f",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/border-rendering-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               56
+              ],
+              [
+               0,
+               9
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
         "closed-listbox-rendering.tentative.html": [
          "4d46aba2281a057405a534e747a6e736be7b5719",
          [
@@ -342707,6 +343196,743 @@
           {}
          ]
         ],
+        "native-popup-with-wrapper-div.tentative.html": [
+         "608fbb86546efb214db9b87290dac99494a74b6d",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/native-popup-with-wrapper-div-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "picker-and-slotted.tentative.html": [
+         "3e57757eb0100d182ed9e5722688ae82ee99cf03",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/picker-and-slotted-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-appearance-active.tentative.html": [
+         "3873969a2875d6f3ffcec5f788cc25477df9bed3",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-active-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               29
+              ],
+              [
+               0,
+               1
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
+        "select-appearance-custom-button.tentative.html": [
+         "89683d29f6ec0d73727208a5c144d5a89248feac",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-button-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-appearance-dark-mode.tentative.html": [
+         "d2ea44a20e417df9aed559bf8671214e766ce00e",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-dark-mode-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               1
+              ],
+              [
+               0,
+               12
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
+        "select-appearance-default-button.tentative.html": [
+         "f0e17ff349b2f456320dc4388ca7a89309e0bbaa",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-button-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               1
+              ],
+              [
+               0,
+               1
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
+        "select-appearance-disabled-option.tentative.html": [
+         "b4cd7ba67e031b448c2fa5f6220b8ecea44d306b",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-disabled-option-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               37
+              ],
+              [
+               0,
+               1
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
+        "select-appearance-fallback-bottom-left-scroller.tentative.html": [
+         "77f97efab212c0ae76ec33f39e5d508c1abd6b27",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-scroller-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-appearance-fallback-bottom-left.tentative.html": [
+         "c8fa2f60d24ace5286760295c1e960ad9352b909",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-appearance-fallback-bottom-right-scroller.tentative.html": [
+         "b7eefc25585e15dd8a7c0ebbda4e28e49f004757",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-scroller-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-appearance-fallback-bottom-right.tentative.html": [
+         "9ce12bc20e74400ebb2b1d4cfa93a4f123dd0b6e",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-appearance-fallback-top-left-scroller.tentative.html": [
+         "3f8358f65405aabb7b6a9e9ee28930a06340bbc9",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-scroller-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-appearance-fallback-top-left.tentative.html": [
+         "6e276aef8d2bc2ab63525ef3d5e20dcdd4d408ce",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-appearance-fallback-top-right-scroller.tentative.html": [
+         "4d04a7caa9c821f533331f8aceebc76cd5149c0d",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-scroller-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-appearance-fallback-top-right.tentative.html": [
+         "b0c4c510e7d0adde7445ca677bff2ff5a4dd862a",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-appearance-font-inheriting.tentative.html": [
+         "f90e7c8896f90dd9022cf2aa13ba5f80fe204674",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-font-inheriting-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               50
+              ],
+              [
+               0,
+               8
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
+        "select-appearance-hover.tentative.html": [
+         "b5e24d07947c8918fc505256035d14b4943d61af",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-hover-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               33
+              ],
+              [
+               0,
+               1
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
+        "select-appearance-optgroup-legend-and-label.tentative.html": [
+         "666dde2f60e316bae3620141414a9be5201d932d",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend-ref.html",
+            "!="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-appearance-optgroup-legend.tentative.html": [
+         "6b973bc84ec7e9c4f249c8cf3002370f9336e016",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               1
+              ],
+              [
+               0,
+               1
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
+        "select-appearance-optgroup-rendering.tentative.html": [
+         "fd48e61731d329d34a08e2587988cbb5f201421b",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-rendering-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               1
+              ],
+              [
+               0,
+               1
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
+        "select-appearance-option-with-label.tentative.html": [
+         "c5abc14c3860e860b64e9ac652f9e1d55d3e9c4d",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-button-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               1
+              ],
+              [
+               0,
+               1
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
+        "select-appearance-picker-select-border.tentative.html": [
+         "c708af4db1f7bd186e7da3ab23f1c075116e0b62",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-picker-select-border-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               41
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
+        "select-appearance-switching-invalidation.tentative.html": [
+         "fd67d013a5641369e49745ebf6bbecaec1e36d1a",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-switching-invalidation-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               40
+              ],
+              [
+               0,
+               2
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
+        "select-appearance-writing-mode-vertical-lr.tentative.html": [
+         "4932ea37f72164e76c51664e55af98b5b1605869",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-lr-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-appearance-writing-mode-vertical-rl.tentative.html": [
+         "4b532a6f0257aead58fe43d9f72a0b6aa9bc644b",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-rl-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-appearance-wrong-picker-argument.tentative.html": [
+         "a5ca3faea25dd10d7a692727c7e446cb9e38c913",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-button-ref.html",
+            "!="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-explicit-size.tentative.html": [
+         "4fefc96c2be3214935cbf1b0d7347c291cdf54c7",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-explicit-size-ref.tentative.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-font-size.tentative.html": [
+         "3b6b65db071cf948f015af67ce2ca6bde671912a",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-font-size-ref.tentative.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-icon-color.tentative.html": [
+         "59f015b86b4fa92a103d64964b21d7a50c5b174a",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-icon-color-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               41
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
+        "select-multiple-base-appearance.html": [
+         "5304ce8aa9a2348d2445d330085d0f996653486a",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-multiple-base-appearance-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-only-button-opt-in.tentative.html": [
+         "b010d15e8adab1ebfe448842e195e29b24d332fb",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-appearance-button-ref.html",
+            "!="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-only-picker-opt-in.tentative.html": [
+         "51cdabe18b4666af126f42283e74db62f41eadc1",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-only-picker-opt-in-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
+        "select-open-invalidation.tentative.html": [
+         "10a441703be9ad0a49601de1159d63eea09e8b6e",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-open-invalidation-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               40
+              ],
+              [
+               0,
+               2
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
+        "select-option-images.tentative.html": [
+         "b0c8f279b700d9943a680f0886d38f3383ef233a",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-option-images-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               40
+              ],
+              [
+               0,
+               2
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
+        "select-popover-exit-animation.tentative.html": [
+         "f047474d9b394dac9ac62d3ddf7eb897eb871394",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-popover-exit-animation-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               41
+              ],
+              [
+               0,
+               6
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
+        "select-second-child-button.tentative.html": [
+         "ae216294ee54732a7bf39c2ef9e7ea669d99b05d",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-second-child-button-ref.html",
+            "=="
+           ]
+          ],
+          {
+           "fuzzy": [
+            [
+             null,
+             [
+              [
+               0,
+               37
+              ],
+              [
+               0,
+               1
+              ]
+             ]
+            ]
+           ]
+          }
+         ]
+        ],
+        "select-selected-value-behavior.tentative.html": [
+         "a55fbce739357ecd45c67132d4daa9679dfdd0d7",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-selected-value-behavior-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
+        ],
         "select-size-multiple-new-content.tentative.html": [
          "ba45cc1a148c8ea4cf9f56e737e344a382da286a",
          [
@@ -342719,6 +343945,19 @@
           ],
           {}
          ]
+        ],
+        "select-text-only.tentative.html": [
+         "a27ef3d1636ad106370a9b0b8bba850be32f44b9",
+         [
+          null,
+          [
+           [
+            "/html/semantics/forms/the-select-element/customizable-select/select-text-only-ref.html",
+            "=="
+           ]
+          ],
+          {}
+         ]
         ]
        },
        "reset-algorithm-rendering.html": [
@@ -345755,6 +346994,45 @@
        ],
        {}
       ]
+     ],
+     "testdriver-iframe.sub.html": [
+      "fb62009b9a11697d68c2a7bf87df3c7a5f20c6e1",
+      [
+       null,
+       [
+        [
+         "/infrastructure/reftest/green.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "testdriver-in-ref.html": [
+      "8a1af46db354624c3fd03ce6f3b6a0165ebf26c5",
+      [
+       null,
+       [
+        [
+         "/infrastructure/reftest/testdriver.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "testdriver.html": [
+      "d890d8926273af84acf01372bd2e4fbd74d47003",
+      [
+       null,
+       [
+        [
+         "/infrastructure/reftest/green.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
      ]
     },
     "reftest-wait.html": [
@@ -420927,6 +422205,10 @@
        "89a1929e275bac96c2a2e845124e0bd9cecd3cfa",
        []
       ],
+      "gradient-single-stop-longer-hue-hsl-002-ref.html": [
+       "2862a7a7ab85bc936eb678056d1c487edb5cd1dc",
+       []
+      ],
       "gradient-single-stop-longer-hue-hsl-ref.html": [
        "cf47c758348bfb8fee4215f1cf2f24687ef80ba9",
        []
@@ -428882,6 +430164,24 @@
        []
       ]
      },
+     "scroll-initial-target": {
+      "scroll-initial-target-with-anchor-navigation-inner-frame.html": [
+       "c363961add7aaba5c3320b31589706eb8757083b",
+       []
+      ],
+      "scroll-initial-target-with-hash-fragment-navigation-inner-frame.html": [
+       "1c81212e216a81220e658fabe67c9645eab0fe09",
+       []
+      ],
+      "scroll-initial-target-with-text-fragment-navigation-target.html": [
+       "4cad10e0b3ef0ab9d609c3eba3f59b9d82ff100b",
+       []
+      ],
+      "stash.py": [
+       "1b1800d30efbd20140896bd1977a3b2e28d60e6f",
+       []
+      ]
+     },
      "scroll-start": {
       "scroll-start-with-anchor-navigation-inner-frame.html": [
        "c32bac913d2672eaa9976a8e7407566ad9b3224d",
@@ -428900,24 +430200,6 @@
        []
       ]
      },
-     "scroll-start-target": {
-      "scroll-start-target-with-anchor-navigation-inner-frame.html": [
-       "de02dcf00f68ee13ee00e31877d62199d22922f7",
-       []
-      ],
-      "scroll-start-target-with-hash-fragment-navigation-inner-frame.html": [
-       "90629c4990f6753dd770e00ad7da7a6b21a984bf",
-       []
-      ],
-      "scroll-start-target-with-text-fragment-navigation-target.html": [
-       "80cbb55fb2730d8dc5cc3edd880e8e890281ef05",
-       []
-      ],
-      "stash.py": [
-       "3c65e2b59b3e54f670929ba22a5a21591753dbe9",
-       []
-      ]
-     },
      "scrollsnapchange": {
       "WEB_FEATURES.yml": [
        "5bd7aef477a5f8a78d1d67ccbe77d107ecec39dd",
@@ -430388,6 +431670,12 @@
       "40b0c862ae4bbeb48cc1e15db9b48f0b561d266e",
       []
      ],
+     "stretch": {
+      "block-height-003-ref.html": [
+       "76e2bc35cb78208bfa193d6b3d7a6d5ce501a73c",
+       []
+      ]
+     },
      "support": {
       "dynamic-available-size-iframe.html": [
        "8b61c876389e1fbd0792dd58763e3e2a3d4ef133",
@@ -443904,6 +445192,10 @@
       "21c33ea1cd44fa23f6f92c3881e6ef22d33587d2",
       []
      ],
+     "fecolormatrix-negative-ref.html": [
+      "95a0051c18a1219012e48ad91e58ecc213ba24b6",
+      []
+     ],
      "fecolormatrix-type-ref.html": [
       "182b4b547c0d8f45c0b55a290d7d5b83e297364c",
       []
@@ -446473,7 +447765,7 @@
       []
      ],
      "testdriver.md": [
-      "462c7b85503cb9a8e7effa11378fe6ec4e9f2be8",
+      "cdf081ef318d332217f5ee59f9f9b0c5d9bd2bc1",
       []
      ],
      "testharness-api.md": [
@@ -447301,7 +448593,7 @@
       []
      ],
      "delete.js": [
-      "c4d1225ef35bad1638afe112b2741582e3b5ac47",
+      "dcb3a6a28dfe7ecb5b33749f176a195287b77b52",
       []
      ],
      "fontname.js": [
@@ -447321,7 +448613,7 @@
       []
      ],
      "forwarddelete.js": [
-      "a881fb6ccf4618c16c3ac782bd5de1d1fb5a7aa9",
+      "66d978c73de916b039007035b9263f038bdada6b",
       []
      ],
      "hilitecolor.js": [
@@ -447361,7 +448653,7 @@
       []
      ],
      "inserttext.js": [
-      "568b467f153c486b3792ca16947920b14d0a0859",
+      "7e9dd05fe460bd853491830ea25986825e51d6d4",
       []
      ],
      "insertunorderedlist.js": [
@@ -447393,7 +448685,7 @@
       []
      ],
      "multitest.js": [
-      "e85f54addfc80919bed813b8a9236ee3fd508360",
+      "2d5404ba8989035a99d097f3322e65c7804c0af4",
       []
      ],
      "outdent.js": [
@@ -447433,7 +448725,7 @@
     },
     "include": {
      "editor-test-utils.js": [
-      "b302d19a117503c3ed5bd0d71f4feee1d3d21f26",
+      "b2e53515e0f794fab0900cd7ec3b26a953bcf640",
       []
      ],
      "implementation.js": [
@@ -447481,7 +448773,7 @@
       []
      ],
      "element-timing-helpers.js": [
-      "8175b0f3850cf85164091d1c892e4eb34de983f2",
+      "2c1bd195ea76f8126d739e705fed7af3a562fc45",
       []
      ],
      "iframe-stores-entry.html": [
@@ -451438,7 +452730,7 @@
        []
       ],
       "fetch-metadata.conf.yml": [
-       "b96bd2fd7b4b81f6681ec84ffe41afe85576f1fd",
+       "bc764aed02de4c12fa3393c19b202904e29c9bf4",
        []
       ],
       "generate.py": [
@@ -451984,11 +453276,11 @@
        []
       ],
       "ba-fledge-util.sub.js": [
-       "d981e6a056e978d41879cb5b7b05285d5b931351",
+       "3aef43d70d6ea79a5fe743543de865ba4266ba5f",
        []
       ],
       "ba-public-keys": [
-       "60580a74d06a78db23d0d551a9d4a014bee77994",
+       "32b1c1babe5b6da9441e5ffc44f7eecc33454fa0",
        []
       ],
       "bidding-logic.sub.py": [
@@ -453631,6 +454923,20 @@
       ]
      }
     },
+    "rendering": {
+     "backdrop-green-ref.html": [
+      "3126fe194261f7ce7f6039885e4ec73e7a997468",
+      []
+     ],
+     "backdrop-object-ref.html": [
+      "6c7071a727dd27d182ae017e9f6dbc0834361ddc",
+      []
+     ],
+     "fullscreen-root-fills-page-ref.html": [
+      "b2bf13557a2c3540645e3aa45a0850a61f8f0b28",
+      []
+     ]
+    },
     "trusted-click.js": [
      "51fbce7ee4355ec4ac2b923f24feb75a944f4390",
      []
@@ -458657,7 +459963,7 @@
         []
        ],
        "text.yaml": [
-        "38630509bf2f79eda68ae6c5de82c1050b98f7c4",
+        "42bf9a3c93964c4bc0ea575ce36d6892fba01bc0",
         []
        ],
        "the-canvas-state.yaml": [
@@ -466579,23 +467885,171 @@
          "72abb8843f6dab611347c60a5c3ab06860f3a33b",
          []
         ],
+        "border-rendering-ref.html": [
+         "2ecb3a06bfe85b43ac411ca58a08ef68919aba27",
+         []
+        ],
         "closed-listbox-rendering-ref.html": [
          "d1a1f1bb61ff377679eac4c19efe0f8c4071a4ba",
          []
         ],
+        "native-popup-with-wrapper-div-ref.html": [
+         "6540e324b5d935a1f335b4e1d1b1cc36bb90a5fe",
+         []
+        ],
+        "picker-and-slotted-ref.html": [
+         "8ae5c7978ddfe5bf0d29844130792c482850bb92",
+         []
+        ],
         "resources": {
          "blank.html": [
           "83df0e65644224c4267215e3d24987b0bcc537f0",
           []
          ],
+         "customizable-select-styles.css": [
+          "65b3c39019aec0a18e4f7997292f4b2b27c660a7",
+          []
+         ],
+         "customizable-select-utils.js": [
+          "ed3f9642a865feae73057d95fed2d0cd93e0a94b",
+          []
+         ],
+         "fallback-helper.js": [
+          "d2b9343e8d3fc6d98168a32db4d24daf1541a04b",
+          []
+         ],
          "selectedcontent-restore-iframe.html": [
           "b38ed6275480a8feca17f96182a6a9a2e120d7e3",
           []
          ]
         },
+        "select-appearance-active-ref.html": [
+         "9c62188a4934de12a1f0a7ecc2bdea96c0c054b3",
+         []
+        ],
+        "select-appearance-button-ref.html": [
+         "7b6a075237edd9f72df8f7fd48bca2174a98fdcd",
+         []
+        ],
+        "select-appearance-dark-mode-ref.html": [
+         "9d80e27d86de9d3e161090713be3c436dc4883df",
+         []
+        ],
+        "select-appearance-disabled-option-ref.html": [
+         "0b59f2839b5cd2983a7279827b93788c50527cae",
+         []
+        ],
+        "select-appearance-fallback-bottom-left-ref.html": [
+         "fbc1b25e72bbf6034b6fdfdf34f7cea8012c5eb8",
+         []
+        ],
+        "select-appearance-fallback-bottom-left-scroller-ref.html": [
+         "687e64da292c8ae677ff893a20bb6620a8ae2abe",
+         []
+        ],
+        "select-appearance-fallback-bottom-right-ref.html": [
+         "ba9867ddd5167c1e1a0b7b0ecf85c44979406a29",
+         []
+        ],
+        "select-appearance-fallback-bottom-right-scroller-ref.html": [
+         "97af58d6d38e57f6ee5a112c9ce8b7b5f59a6873",
+         []
+        ],
+        "select-appearance-fallback-top-left-ref.html": [
+         "e325f74ef99fe27deedd2aa44d9a3710a9a1f0d7",
+         []
+        ],
+        "select-appearance-fallback-top-left-scroller-ref.html": [
+         "3822fb30f2824f40094fd7cf4059e958b4252566",
+         []
+        ],
+        "select-appearance-fallback-top-right-ref.html": [
+         "3b1260427f7e9639c7ffc59197aec1c5a9eeba56",
+         []
+        ],
+        "select-appearance-fallback-top-right-scroller-ref.html": [
+         "548846160950a2ad575446e42da6417c0e39a995",
+         []
+        ],
+        "select-appearance-font-inheriting-ref.html": [
+         "6321281fa8f71edf9f675096f2b7bb4745c44aeb",
+         []
+        ],
+        "select-appearance-hover-ref.html": [
+         "fc658306da3d4ff96b99ea0e7398534712c3b996",
+         []
+        ],
+        "select-appearance-optgroup-legend-ref.html": [
+         "6d75f62efcd41cc624714398dde7f1b634a3f701",
+         []
+        ],
+        "select-appearance-optgroup-rendering-ref.html": [
+         "25bb73492a809588ee60f04aa661d8e7bf27ea4c",
+         []
+        ],
+        "select-appearance-picker-select-border-ref.html": [
+         "d09f9bc42166908f9161911ea8bcd9d7124284af",
+         []
+        ],
+        "select-appearance-switching-invalidation-ref.html": [
+         "293653055558e212f9c8cd242b1a571037be9b6b",
+         []
+        ],
+        "select-appearance-writing-mode-vertical-lr-ref.html": [
+         "2e36e0a6c8e53d6564f5935dc1609ef7b6234180",
+         []
+        ],
+        "select-appearance-writing-mode-vertical-rl-ref.html": [
+         "e24aec5ad2303c52d263a5c0c0d14b3210e0292a",
+         []
+        ],
+        "select-explicit-size-ref.tentative.html": [
+         "91066653a30c396c197d254f457d5c39c99bbe34",
+         []
+        ],
+        "select-font-size-ref.tentative.html": [
+         "eb7867b554ded7c674547e04a121be183575cef9",
+         []
+        ],
+        "select-icon-color-ref.html": [
+         "b351c80c273940c8422db8f66da959fb36e962cb",
+         []
+        ],
+        "select-multiple-base-appearance-ref.html": [
+         "18ad4ecc3fa1236aa85fe88a2b5ceeb1ba436041",
+         []
+        ],
+        "select-only-picker-opt-in-ref.html": [
+         "67a0abe43f2d1aad0b1d82da8b8cdfc77a25b549",
+         []
+        ],
+        "select-open-invalidation-ref.html": [
+         "e0631712ef70e7e65f92e331ca4fc69a70f90dde",
+         []
+        ],
+        "select-option-images-ref.html": [
+         "9c675e4f21018ccff221b7fdfda6e729f3ed7c75",
+         []
+        ],
+        "select-popover-exit-animation-ref.html": [
+         "994d3a5fb2163eef9ab5bcfcf313dee661e2290c",
+         []
+        ],
+        "select-second-child-button-ref.html": [
+         "636d0514c454a54e0f5500e9013a8488ba6e7552",
+         []
+        ],
+        "select-selected-value-behavior-ref.html": [
+         "7260b242743652827dda88003e970e5fa3a51540",
+         []
+        ],
         "select-size-multiple-new-content-ref.html": [
          "dccff7311d1c8c425ca4a199c5fb1e4ed6181a6e",
          []
+        ],
+        "select-text-only-ref.html": [
+         "154fbad9ca3a4ace9655cfd8fb377f895fff3d81",
+         []
         ]
        },
        "reset-algorithm-rendering-ref.html": [
@@ -469043,6 +470497,22 @@
       }
      },
      "speculative-parsing": {
+      "expect-no-linked-resources": {
+       "resources": {
+        "no-speculative-fetch.sub.html": [
+         "96169de10336c2ee354edebb416dc4faf0958695",
+         []
+        ],
+        "no-speculative-fetch.sub.html.headers": [
+         "ff1502d32fc24af59c7034c99aaa7f0ace1da0b8",
+         []
+        ],
+        "stash.py": [
+         "73e1f3abe5ecee2e724d3013f5210941ce8f5b8d",
+         []
+        ]
+       }
+      },
       "generated": {
        "page-load": {
         "resources": {
@@ -471417,6 +472887,10 @@
        "reftest_timeout.html.ini": [
         "0d1b9bade95d7b101c8dbf51547ffbaec2260c27",
         []
+       ],
+       "testdriver-in-ref.html.ini": [
+        "05850761b1649974c759e90293c576b36521b953",
+        []
        ]
       },
       "server": {
@@ -471627,6 +473101,10 @@
      "size-ref.html": [
       "bb792a3feb21cc0c03d0734e97f119dcce3dd10a",
       []
+     ],
+     "testdriver-child.html": [
+      "38ea532fee11b4c7a324b11acf6757c0954c8fb2",
+      []
      ]
     },
     "reftest-wait-ref.html": [
@@ -473457,7 +474935,7 @@
     ]
    },
    "lint.ignore": [
-    "32c22fecfec65a1d87920a90bd00129fe0de257e",
+    "00fb7fd020192843abd6ba46baabd86ca0ce129f",
     []
    ],
    "loading": {
@@ -473748,7 +475226,7 @@
        []
       ],
       "utils.js": [
-       "b50fc5ced684e8d1f0c98b1f56527278f36228e8",
+       "66b3cf40ba2bf734ae308899c44d278839db77b1",
        []
       ]
      }
@@ -485976,7 +487454,7 @@
      []
     ],
     "helpers.js": [
-     "a1fd02ab5e60b86421d22e98953b748a2da69415",
+     "a698fac6491a172f8da9fc0a11519d567385b333",
      []
     ],
     "resources": {
@@ -486004,6 +487482,14 @@
       "07e8c2dae3ceaa86766b2050784850a7f5ca23b8",
       []
      ],
+     "handle-headers-non-retry.py": [
+      "b4b3c0ec83b33ea7257810398c63a701ac3b546a",
+      []
+     ],
+     "handle-headers-retry.py": [
+      "ca079489b183619ec005cbf52b3bb7f619754c5a",
+      []
+     ],
      "hasStorageAccess-ABA-iframe.https.html": [
       "fdceefc0ab83be284b2521ab8381930e4194aa38",
       []
@@ -486020,6 +487506,14 @@
       "46194adcf804101da3db622a3c244ba10b1976dd",
       []
      ],
+     "header-helpers.py": [
+      "6909fd896ede888ec664f6414e993ce4aeba9eaa",
+      []
+     ],
+     "nested-handle-storage-access-headers.py": [
+      "db0bf34357382e15d99e7a9045437be214a58064",
+      []
+     ],
      "permissions-iframe.https.html": [
       "b83a05c3f1bdf00107447527d5e009b06ddb0187",
       []
@@ -486040,6 +487534,10 @@
       "828af799e6cad6ce5e4901010db7d9af93ec3321",
       []
      ],
+     "retrieve-storage-access-headers.py": [
+      "553c0c6dd4a6c18337bc6f263fec5ea13bb35c20",
+      []
+     ],
      "script-with-cookie-header.py": [
       "2237bba463547e890dc12bd4b11edbd7b539d9d7",
       []
@@ -487478,6 +488976,10 @@
      }
     },
     "types": {
+     "helper-SVGElement.ownerSVGElement-02.svg": [
+      "2335bb42c5142ca96a63a4ec457d67ea439638ab",
+      []
+     ],
      "scripted": {
       "resources": {
        "SVGLengthList-helper.js": [
@@ -487891,7 +489393,7 @@
       []
      ],
      "lint.py": [
-      "32bc7ece7b12f366fae0278fe4de06df43395583",
+      "c1c3b252f9113869587b239d8d82005a3d180d10",
       []
      ],
      "rules.py": [
@@ -488092,7 +489594,7 @@
        }
       },
       "test_file_lints.py": [
-       "e77048b31566887576d31c37d3d80833336131c2",
+       "b2b15f68665a6d4da184cd83f41abe85e6d63673",
        []
       ],
       "test_lint.py": [
@@ -488133,7 +489635,7 @@
       []
      ],
      "item.py": [
-      "e25f7ca2c29adc3cd9165992117b37bece5fc312",
+      "e1f509bbdab4dbcae655e3a84247227b8e39021e",
       []
      ],
      "jsonlib.py": [
@@ -488157,7 +489659,7 @@
       []
      ],
      "sourcefile.py": [
-      "02ab1ad4fe6017226c8999568a7dd2bbccfd1a96",
+      "e5fd0294a546ebeccac080735deba350ad5e2715",
       []
      ],
      "spec.py": [
@@ -488182,7 +489684,7 @@
        []
       ],
       "test_manifest.py": [
-       "7511b21bc8358944fec44807de1470a7f9bdffb7",
+       "621b71c091e71335338f622ebcab9830028aa86a",
        []
       ],
       "test_sourcefile.py": [
@@ -498893,7 +500395,7 @@
       []
      ],
      "virtualenv.py": [
-      "f1fad7327013d8de1036a7589762f2fdb99b8cfc",
+      "46407318cd3aa07bbd41bb40cbac30898b0ef30b",
       []
      ],
      "wpt.py": [
@@ -499027,7 +500529,7 @@
         []
        ],
        "headless_shell.py": [
-        "7fd11fecbe0e7022a047cd1f58cd4f220739e66f",
+        "c20d4011eeb551a2f334db6c9051b42d51c4d388",
         []
        ],
        "ladybird.py": [
@@ -499082,7 +500584,7 @@
        []
       ],
       "environment.py": [
-       "071ff6df716594246c87c87504b3d9819ea0fcba",
+       "9a6d3c8fb603346cfb51cef4082e60273b2a4b69",
        []
       ],
       "executors": {
@@ -499103,7 +500605,7 @@
         []
        ],
        "executorchrome.py": [
-        "9534eaea17146a3a7de6195f5d4d0564718d2866",
+        "8f9d45d6f6f429519fac58075e6b16cb4d80ae55",
         []
        ],
        "executoredge.py": [
@@ -499127,13 +500629,17 @@
         []
        ],
        "executorwebdriver.py": [
-        "ed145823e2b9009b9eb6f02056eb75d7dbe266c3",
+        "7513887998d6cdbcec736ebfb885108c015fd0a7",
         []
        ],
        "executorwktr.py": [
         "3c02fa799e083b847bbcc0e6a59819da97096ee6",
         []
        ],
+       "message-queue.js": [
+        "c79b96aee29ec7aa473189641a1a6d6a7d6c87f6",
+        []
+       ],
        "process.py": [
         "b90e45d36780f0a89b0f8bc9ff2b29a221bdf839",
         []
@@ -499161,7 +500667,7 @@
         []
        ],
        "test-wait.js": [
-        "ad08ad7d76fb0299aadedb572193c38c5055e654",
+        "fca6f8df3b856e86597e3c3ceb222ad6c457efd1",
         []
        ],
        "testharness_servodriver.js": [
@@ -499254,7 +500760,7 @@
        []
       ],
       "testdriver-extra.js": [
-       "c4a02ef40a7eda93f26488185e0f7d3ff3762821",
+       "2dd9a70c8298953fdfdaa050d8fb441b34348bb8",
        []
       ],
       "testdriver-vendor.js": [
@@ -499274,11 +500780,11 @@
        []
       ],
       "testharnessreport.js": [
-       "d385692445c5086d0ad4815926b7b2c2a93dd493",
+       "fb9e8c678de63a5e5eaad5abc24a082910fa53a9",
        []
       ],
       "testloader.py": [
-       "5969f4ed60ede433eccda4cd52cdc01a1a8db83a",
+       "b5747772050a1c055ea163e79915f1ad79995591",
        []
       ],
       "testrunner.py": [
@@ -499345,7 +500851,7 @@
         []
        ],
        "test_testloader.py": [
-        "4555fb7966149a9d48e9fb28fdf4405776e21d1a",
+        "66af4cbb26d8fb4cc189c92e8633d5e083979bae",
         []
        ],
        "test_update.py": [
@@ -499353,7 +500859,7 @@
         []
        ],
        "test_wptrunner.py": [
-        "4e0e7abc937b59c8b4420715ffa67a4d8305a11b",
+        "cea376e9267597c8eeb7fe720356662d2d505460",
         []
        ],
        "test_wpttest.py": [
@@ -499396,7 +500902,7 @@
        []
       ],
       "wptcommandline.py": [
-       "421c003071e45fa3aa540fa933086fd0387869bc",
+       "d0fa429996556cfbec88095c9fef7b093c9b83b9",
        []
       ],
       "wptlogging.py": [
@@ -499466,11 +500972,11 @@
        }
       },
       "wptrunner.py": [
-       "7d26bb76d75c3ce9ebbffcdd9cac3f57a5623e75",
+       "23ad3b75859cd2134122f8b21c4222379ce670fd",
        []
       ],
       "wpttest.py": [
-       "2e3fd974d4d43eed1efc0e0d46085b8c56ab4521",
+       "42214f07e399f4d32a8cb05ff4c994afc8c09b2f",
        []
       ]
      },
@@ -499804,7 +501310,7 @@
        []
       ],
       "handlers.py": [
-       "62faf47d6456924cc99ef4d30a7216030f36eb71",
+       "cde04b13cbb08845c272b1940ef32e58e80e532a",
        []
       ],
       "logger.py": [
@@ -499989,7 +501495,7 @@
       []
      ],
      "helper.sub.js": [
-      "1775cd985c24df970f00903a3c8d7f4705d77851",
+      "dcde42a167341587b732cad1efd08c4c72582f7c",
       []
      ],
      "namespaces.js": [
@@ -504161,7 +505667,7 @@
     },
     "resources": {
      "utils.js": [
-      "b1916d0a4f1d755899eeab1f90161781164d0e0f",
+      "a976fc555c5f494f1ba0b6a1aa7590f32ba92536",
       []
      ],
      "utils_validation.js": [
@@ -508985,7 +510491,7 @@
      ]
     ],
     "BlobURL": {
-     "cross-partition-navigation.tentative.https.html": [
+     "cross-partition-navigation.https.html": [
       "ee879b0d95508a6dfd0f03973903c03f4a1dfa2a",
       [
        null,
@@ -508994,7 +510500,7 @@
        }
       ]
      ],
-     "cross-partition-worker-creation.tentative.https.html": [
+     "cross-partition-worker-creation.https.html": [
       "c8234cfb769b0523ed2853781dbd7f5df7384ca7",
       [
        null,
@@ -509003,7 +510509,7 @@
        }
       ]
      ],
-     "cross-partition.tentative.https.html": [
+     "cross-partition.https.html": [
       "31b86bbd5b765934a44b0e3883ddb8f53e9620e1",
       [
        null,
@@ -511101,25 +512607,241 @@
       }
      ]
     ],
-    "fire-error-event-exception.html": [
-     "f380e4081f103dbb9f510b8f73f0f299bd6c27bc",
+    "fire-error-event-exception.any.js": [
+     "ade2a7251e3c0170a9022b962a655cede1df567b",
      [
-      null,
-      {}
+      "IndexedDB/fire-error-event-exception.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Fire error event - Exception thrown"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/fire-error-event-exception.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Fire error event - Exception thrown"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/fire-error-event-exception.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Fire error event - Exception thrown"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/fire-error-event-exception.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Fire error event - Exception thrown"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
      ]
     ],
-    "fire-success-event-exception.html": [
-     "eaff1b962a00ab4f2ff35831148c7eb95ed5d8da",
+    "fire-success-event-exception.any.js": [
+     "bd757ea6b1f9d7108367fbcd148b04bc9c16327d",
      [
-      null,
-      {}
+      "IndexedDB/fire-success-event-exception.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Fire success event - Exception thrown"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/fire-success-event-exception.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Fire success event - Exception thrown"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/fire-success-event-exception.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Fire success event - Exception thrown"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/fire-success-event-exception.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Fire success event - Exception thrown"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
      ]
     ],
-    "fire-upgradeneeded-event-exception.html": [
-     "7160dbdfc7d6b52239fc8c4b07a0543fdea83d6f",
+    "fire-upgradeneeded-event-exception.any.js": [
+     "3b17d90f7ca76894ab4614f56314a6e827647460",
      [
-      null,
-      {}
+      "IndexedDB/fire-upgradeneeded-event-exception.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Fire upgradeneeded event - Exception thrown"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/fire-upgradeneeded-event-exception.any.serviceworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Fire upgradeneeded event - Exception thrown"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/fire-upgradeneeded-event-exception.any.sharedworker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Fire upgradeneeded event - Exception thrown"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "IndexedDB/fire-upgradeneeded-event-exception.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,worker"
+        ],
+        [
+         "title",
+         "Fire upgradeneeded event - Exception thrown"
+        ],
+        [
+         "script",
+         "resources/support.js"
+        ]
+       ]
+      }
      ]
     ],
     "get-databases.any.js": [
@@ -525822,7 +527544,7 @@
       ]
      ],
      "comp_name_from_content.html": [
-      "32a9a7b3c43b0f25fc09045c1a630a71c784b265",
+      "b0c92c8142c28a5dde5fd87ed1077b88421765bd",
       [
        null,
        {
@@ -535748,7 +537470,7 @@
      ]
     ],
     "basic.html": [
-     "79a91e127ef6846427d63ff0c21fe42dcb9611de",
+     "1b092630559641b8f09fa8889cadbe8f0d405349",
      [
       null,
       {
@@ -535820,7 +537542,7 @@
      ]
     ],
     "inside-event-listeners.html": [
-     "47f431e25036748f2e5106549660f8c9bb8cf483",
+     "93996fb5fee32861905dcca605d33f22a369cf94",
      [
       null,
       {
@@ -544890,7 +546612,7 @@
       ]
      ],
      "report-clips-sample.https.html": [
-      "ae9e380bc2d142b95affcad0a63bf6dd1b466d15",
+      "fe6b457fc7b40fab610dbbd5655025fb53380e9f",
       [
        null,
        {}
@@ -545897,6 +547619,13 @@
        {}
       ]
      ],
+     "linenumber.tentative.html": [
+      "3299a6af2fb2896c21159b95c2495fcd0b851aef",
+      [
+       null,
+       {}
+      ]
+     ],
      "script-sample-no-opt-in.html": [
       "3e25ce299c46f354881c8a7cee81986f7a374659",
       [
@@ -552581,14 +554310,14 @@
       ]
      ],
      "position-try-order-basic.html": [
-      "c7705a71bbb5fe0a8833604a2edc8bcf43639636",
+      "f54ce44f72333a3b09f2445d81ac0d69d0b6f740",
       [
        null,
        {}
       ]
      ],
      "position-try-order-position-area.html": [
-      "3b7a3475c759d0910b770e89c9df6adf0ac0e62a",
+      "4ffbbd0b71ded8991b89b8ae69ac68383560da15",
       [
        null,
        {}
@@ -556113,7 +557842,7 @@
       ]
      ],
      "scope-nesting.html": [
-      "2811bb4635d65fe4d6f2e6b181ae663a481ddd38",
+      "146a3f4ae2892d86d8964aa8d4110f9035d296a9",
       [
        null,
        {}
@@ -556945,6 +558674,13 @@
         {}
        ]
       ],
+      "container-units-auto.html": [
+       "e2d054d7cca019e800e3f301ac4806e985db2ce8",
+       [
+        null,
+        {}
+       ]
+      ],
       "container-units-basic.html": [
        "2cf5e5c6b1a5f9eff0b5217e4959755394fc7e7f",
        [
@@ -557607,6 +559343,13 @@
         {}
        ]
       ],
+      "size-container-auto-height.html": [
+       "123b3ead2a9121fd4987a7e8fb0766b75eb6a9f3",
+       [
+        null,
+        {}
+       ]
+      ],
       "size-container-no-principal-box.html": [
        "cca59a434cd1f7b81828888d300c281d5944053f",
        [
@@ -558564,14 +560307,14 @@
        ]
       ],
       "content-invalid.html": [
-       "c8454e557e233dbee28a0990ad3f87f265efacaa",
+       "efd4ea5136c489ccd38a25732864f4165a9a2b81",
        [
         null,
         {}
        ]
       ],
       "content-valid.html": [
-       "60d03a4d4c3412f15607721dae5d04dbdbf2c682",
+       "097bf66f62b2151eedf33bc94616110ad77bb71d",
        [
         null,
         {}
@@ -562621,21 +564364,35 @@
         ]
        ],
        "gap-decorations-color-invalid.html": [
-        "a1e6769a95cd5af79e7512176b4afd0282481913",
+        "36f26ceb1634e4b32a8029962db933538e383b9a",
         [
          null,
          {}
         ]
        ],
        "gap-decorations-color-valid.html": [
-        "e8fd4df36151f7713d9065978ed83b955a735906",
+        "d4cb5b1168f4b256d2a1702fbb47ddad08127310",
         [
          null,
          {}
         ]
        ],
        "gap-decorations-style-computed.html": [
-        "379fb89c071774c9864a670dd220d2c2cf462e63",
+        "3d55aed80ba3d96d2c419843c2482657f36bc2ee",
+        [
+         null,
+         {}
+        ]
+       ],
+       "gap-decorations-style-invalid.html": [
+        "1ea533111cd25158e1c553648679c850c791b455",
+        [
+         null,
+         {}
+        ]
+       ],
+       "gap-decorations-style-valid.html": [
+        "d90a9f8337216d263940afa01c1003add8bd1229",
         [
          null,
          {}
@@ -566244,7 +568001,7 @@
        ]
       ],
       "grid-template-shorthand-composition.html": [
-       "781410d51536ec2f6ebeca1315f03519f1967b88",
+       "2c19f737fdc6e50f77f1972cb8a9eb5623ee3004",
        [
         null,
         {}
@@ -568463,6 +570220,27 @@
     "css-masonry": {
      "tentative": {
       "parsing": {
+       "masonry-fill-computed.html": [
+        "44ff30b8cd973ed305422d851ec9aad12abc022a",
+        [
+         null,
+         {}
+        ]
+       ],
+       "masonry-fill-invalid.html": [
+        "10ccde781ff0c570eb1454b10f12b5167ac10e40",
+        [
+         null,
+         {}
+        ]
+       ],
+       "masonry-fill-valid.html": [
+        "23498d40215072ad31bf64a8ebebe41416c97201",
+        [
+         null,
+         {}
+        ]
+       ],
        "masonry-slack-computed.html": [
         "89854a6deceb88a3215ae780f7ce2ba45f3e34bb",
         [
@@ -569175,6 +570953,13 @@
        {}
       ]
      ],
+     "set-selector-text.html": [
+      "fe216a9edbc53ccfa9b695af17ea36339f550bf6",
+      [
+       null,
+       {}
+      ]
+     ],
      "top-level-is-scope.html": [
       "fefc77d5d045381f0def0ce9b6a335a5e38d1165",
       [
@@ -571388,6 +573173,13 @@
         {}
        ]
       ],
+      "highlight-cascade-010.html": [
+       "bbfcffb16aa28091d063048a9b7c609fd1ec5409",
+       [
+        null,
+        {}
+       ]
+      ],
       "highlight-currentcolor-computed-inheritance.html": [
        "90bfc526227d9fb5f74298940c585078ca931257",
        [
@@ -571595,6 +573387,22 @@
      ]
     },
     "css-rhythm": {
+     "computedstyle": {
+      "block-level-replaced-elements-affected-by-block-step-size.html": [
+       "fdbd0da120833efd53afccd34d76e83690e9af32",
+       [
+        null,
+        {}
+       ]
+      ],
+      "inline-level-replaced-elements-not-affected-by-block-step-size.html": [
+       "0531c7edbdcb7b4999b8e23f38ed2575c0dd72e7",
+       [
+        null,
+        {}
+       ]
+      ]
+     },
      "parsing": {
       "block-step-align-computed.html": [
        "f56309bad6645c823436b5b13915d68e65bf5a3c",
@@ -573434,21 +575242,21 @@
        ]
       ],
       "scroll-start-target-computed.html": [
-       "1ebb5e786541d365ec6df3da3becbd9c8d10957c",
+       "50dbcff2397dd2524f791e06ae988b74a881ba28",
        [
         null,
         {}
        ]
       ],
       "scroll-start-target-invalid.html": [
-       "f2a60836d1d9289e20476fff57d3c610cf2d4186",
+       "dfcaaabdeeddc73f995ce691615d8eb2005c6fac",
        [
         null,
         {}
        ]
       ],
       "scroll-start-target-valid.html": [
-       "9ff7055a81cc95a33e04e4fbcda05ff5dab5b473",
+       "3397f19e50c9eee37a94901ee648a1d4eef77d74",
        [
         null,
         {}
@@ -573462,6 +575270,114 @@
        ]
       ]
      },
+     "scroll-initial-target": {
+      "scroll-initial-target-aligns-with-snap-align.tentative.html": [
+       "8dc76a657d7a105cd915a3ddd33ebca68487dfb1",
+       [
+        null,
+        {}
+       ]
+      ],
+      "scroll-initial-target-display-toggled.tentative.html": [
+       "2f58e2393c75db67442eedec6c40706718ee41a4",
+       [
+        null,
+        {}
+       ]
+      ],
+      "scroll-initial-target-nested-container.tentative.html": [
+       "cd2717ed88cc975db9acb61519882a9c735db84b",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
+      "scroll-initial-target-root.tentative.html": [
+       "5cb9e7447333e09544f04f7cd30c95a27d671fea",
+       [
+        null,
+        {}
+       ]
+      ],
+      "scroll-initial-target-rtl.tentative.html": [
+       "7cb0f93c495825123be2fe5941421202f62deea0",
+       [
+        null,
+        {}
+       ]
+      ],
+      "scroll-initial-target-span.tentative.html": [
+       "e7fe0479089cec0548194772ccc7ccf624811d12",
+       [
+        null,
+        {}
+       ]
+      ],
+      "scroll-initial-target-with-anchor-navigation.tentative.html": [
+       "8c6d02a1c7db3065b231b83186c83dd8e767c7c8",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
+      "scroll-initial-target-with-hash-fragment-navigation.tentative.html": [
+       "80b3a0af9f1acaffc214a23403e28bbd631974cb",
+       [
+        null,
+        {}
+       ]
+      ],
+      "scroll-initial-target-with-scroll-snap.tentative.html": [
+       "dfdb8b0277249fb023a79823d6f4582579c333cd",
+       [
+        null,
+        {}
+       ]
+      ],
+      "scroll-initial-target-with-scroll-start-root.tentative.html": [
+       "2405334540faaa6b02de4a31284714b036179f80",
+       [
+        null,
+        {}
+       ]
+      ],
+      "scroll-initial-target-with-scroll-start.tentative.html": [
+       "9c0f58ddbfbfbe283fd764fd081db55b11e50c15",
+       [
+        null,
+        {}
+       ]
+      ],
+      "scroll-initial-target-with-text-fragment-navigation.tentative.html": [
+       "a83b36c26624b26340f55f8ee642e03c4b587c07",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
+      "scroll-initial-target-with-user-programmatic-scroll.tentative.html": [
+       "20d6763034f6dad0297ec0b6d470d028485f59bb",
+       [
+        null,
+        {
+         "testdriver": true
+        }
+       ]
+      ],
+      "scroll-initial-target.tentative.html": [
+       "13e9e20e3e2bad72aaf2f43b6b3c1227df287ced",
+       [
+        null,
+        {}
+       ]
+      ]
+     },
      "scroll-start": {
       "scroll-start-display-toggled.tentative.html": [
        "088c14128e1acbb50e15664d7e5d68ee445de060",
@@ -573552,114 +575468,6 @@
        ]
       ]
      },
-     "scroll-start-target": {
-      "scroll-start-target-aligns-with-snap-align.tentative.html": [
-       "3203e1e1a61593a84d8c1f6a6893768322387da4",
-       [
-        null,
-        {}
-       ]
-      ],
-      "scroll-start-target-display-toggled.tentative.html": [
-       "a0224a568e5658abaef76e6dd0bb67f77fcd70c2",
-       [
-        null,
-        {}
-       ]
-      ],
-      "scroll-start-target-nested-container.tentative.html": [
-       "e3a1df6e6a1b6a27dea2ffe4f768ea167c7962ce",
-       [
-        null,
-        {
-         "testdriver": true
-        }
-       ]
-      ],
-      "scroll-start-target-root.tentative.html": [
-       "860a592bb106a50482b18437b3d8a7186e33a03e",
-       [
-        null,
-        {}
-       ]
-      ],
-      "scroll-start-target-rtl.tentative.html": [
-       "e7766cc07a2c8632030b462c44f550c312137135",
-       [
-        null,
-        {}
-       ]
-      ],
-      "scroll-start-target-span.tentative.html": [
-       "0985dcc2ee91f00032f3b0561a98082da09f4b0d",
-       [
-        null,
-        {}
-       ]
-      ],
-      "scroll-start-target-with-anchor-navigation.tentative.html": [
-       "bc5b75f75f1c32d34b5e5033c25b49d0d5882447",
-       [
-        null,
-        {
-         "testdriver": true
-        }
-       ]
-      ],
-      "scroll-start-target-with-hash-fragment-navigation.tentative.html": [
-       "2d291c2ef9ff92e5fdd530dfafb357297243bc72",
-       [
-        null,
-        {}
-       ]
-      ],
-      "scroll-start-target-with-scroll-snap.tentative.html": [
-       "28bea40d7a04481d3426429dd89f697e061b08c3",
-       [
-        null,
-        {}
-       ]
-      ],
-      "scroll-start-target-with-scroll-start-root.tentative.html": [
-       "daf664aa7fbdf75b88cf16b544b76f5060c6a6a6",
-       [
-        null,
-        {}
-       ]
-      ],
-      "scroll-start-target-with-scroll-start.tentative.html": [
-       "a08daad76db6ddc9a3997fa7f612298ab7f47e91",
-       [
-        null,
-        {}
-       ]
-      ],
-      "scroll-start-target-with-text-fragment-navigation.tentative.html": [
-       "f83ea1a036aee2f8e26796df1c27193e9493b052",
-       [
-        null,
-        {
-         "testdriver": true
-        }
-       ]
-      ],
-      "scroll-start-target-with-user-programmatic-scroll.tentative.html": [
-       "6bcf103253d6c54060a6e07eb370961fea20ad64",
-       [
-        null,
-        {
-         "testdriver": true
-        }
-       ]
-      ],
-      "scroll-start-target.tentative.html": [
-       "1fcb3cbbe40ae91298945a15274f1d4a143a5f43",
-       [
-        null,
-        {}
-       ]
-      ]
-     },
      "scrollsnapchange": {
       "scrollsnapchange-after-layout-change.tentative.html": [
        "7f4ec2ff281f3529e4e8bf1198a5658981e82bc5",
@@ -575983,15 +577791,36 @@
         {}
        ]
       ],
-      "block-height-1.html": [
+      "block-height-001.html": [
        "94960f15b96f9fbb6370e94fbbffb9336373c76c",
        [
         null,
         {}
        ]
       ],
-      "block-height-2.html": [
-       "7028adf90543f4da49b5549fd4a62d777e92b180",
+      "block-height-002.tentative.html": [
+       "2b906985da1288197b825edbaec96ca437d59b20",
+       [
+        null,
+        {}
+       ]
+      ],
+      "block-height-004.tentative.html": [
+       "1aa12ca0dcce578107b870713bfa8071884f8e6a",
+       [
+        null,
+        {}
+       ]
+      ],
+      "block-height-005.tentative.html": [
+       "28756c339f38aa90657675605f588fca44b94831",
+       [
+        null,
+        {}
+       ]
+      ],
+      "content-contribution-001.html": [
+       "5f3706953c914d1ad4fa926b5e0927d8517128da",
        [
         null,
         {}
@@ -586418,7 +588247,7 @@
        ]
       ],
       "at-rule-opt-in-change-with-script.html": [
-       "12452f67634e42746871a74701c87dfeef165048",
+       "c06f28ce1de03ddf92b70addb323dd7f17bcfef9",
        [
         null,
         {}
@@ -588630,7 +590459,7 @@
       ]
      ],
      "serialize-values.html": [
-      "2d20f263f4fd6db4134f6280af50c0037c06d41f",
+      "539052afafffe9a9738aae1591e611126816f6ae",
       [
        null,
        {}
@@ -589780,7 +591609,7 @@
       ]
      ],
      "scrollWidthHeight-contain-layout.html": [
-      "1afab08850664326132ebeb7adbca2337be6ef61",
+      "f787f1a156f773aac904fbdad42a1365564ccc0d",
       [
        null,
        {}
@@ -589794,7 +591623,14 @@
       ]
      ],
      "scrollWidthHeight-negative-margin-002.html": [
-      "418b631f4ba1801157bc4431a28a92bc8d18f888",
+      "1192680c0351cf63259974e2ef46de93158fb83a",
+      [
+       null,
+       {}
+      ]
+     ],
+     "scrollWidthHeight-overflow-visible-margin-collapsing.html": [
+      "322c91afc0838c17ddf9a23f2597017fa8a999fe",
       [
        null,
        {}
@@ -589808,7 +591644,7 @@
       ]
      ],
      "scrollWidthHeightWhenNotScrollable.xht": [
-      "8eb08d55203a5a12a6c1bca93342ea51a1d780a2",
+      "463d31772eb8a7c962fed6eae95bcbe0c746b477",
       [
        null,
        {}
@@ -593703,6 +595539,13 @@
        {}
       ]
      ],
+     "ShadowRoot-importNode.tentative.html": [
+      "dc5ef24bd8009ecc27ac8b592a44497a91b9a68f",
+      [
+       null,
+       {}
+      ]
+     ],
      "ShadowRoot-init-registry.tentative.html": [
       "f9bc5b5b5686a0f5cb43ea653f623ba164c5cabb",
       [
@@ -593717,6 +595560,13 @@
        {}
       ]
      ],
+     "ShadowRoot-innerHTML.tentative.html": [
+      "bee3f18a96d2e3694e5d859e1ca1dc2da5047d4e",
+      [
+       null,
+       {}
+      ]
+     ],
      "constructor-call.tentative.html": [
       "19a8e3f4d8ac690aef9903c492df7a2f8fe99fad",
       [
@@ -598334,7 +600184,7 @@
      "moveBefore": {
       "tentative": {
        "Node-moveBefore.html": [
-        "22586d169c0ba211deafa5a1b510bdbcab567803",
+        "bfee97b4459d590159f3c5d45b900867386b3df6",
         [
          null,
          {}
@@ -598778,7 +600628,7 @@
        ]
       ],
       "observable-inspect.any.js": [
-       "2b67dd9f3d3a830028643cc1bce4e881b687fc16",
+       "24a7a5c8d4841d370bf9915a04a01ac8d4041709",
        [
         "dom/observable/tentative/observable-inspect.any.html",
         {}
@@ -598818,7 +600668,7 @@
        ]
       ],
       "observable-reduce.any.js": [
-       "7c54aa1e8ff9d80e27562fbfae19bc57b9f4a8ca",
+       "18f91e34fca244505cff8f1d858192eb57ddcbe9",
        [
         "dom/observable/tentative/observable-reduce.any.html",
         {}
@@ -603689,6 +605539,16 @@
        }
       ]
      ],
+     "delete-chars-following-collapsible-white-space.html": [
+      "7340a9ebf72e776c2d291f626fd6a9b0a87d984e",
+      [
+       null,
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ]
+     ],
      "delete-list-items-in-table-cell.html": [
       "88f4458987244cf8714ed425c361023070238e86",
       [
@@ -603698,6 +605558,15 @@
        }
       ]
      ],
+     "delete-to-make-editing-host-empty.html": [
+      "d16bb88d6b0e1a4ecda0e4e81b202dea950caa3c",
+      [
+       null,
+       {
+        "testdriver": true
+       }
+      ]
+     ],
      "delete.html": [
       "6a01ffd0441c88d7b89ef1f78b562a6fad9f7a20",
       [
@@ -603851,6 +605720,16 @@
        }
       ]
      ],
+     "forwarddelete-chars-following-collapsible-white-space.html": [
+      "9cfdd9879ec25a209c6b43269c3e4cbc68054763",
+      [
+       null,
+       {
+        "testdriver": true,
+        "timeout": "long"
+       }
+      ]
+     ],
      "forwarddelete.html": [
       "177cee7c1fe77518c567ac96b7486d6006fa4daa",
       [
@@ -633622,7 +635501,7 @@
      ],
      "generated": {
       "audioworklet.https.sub.html": [
-       "64fb7607e26a17969e10ce0308ed8f9bff60cb70",
+       "5ea1cdc8bc986bd1a628fadcf4d74564e3b2d236",
        [
         null,
         {
@@ -633631,21 +635510,21 @@
        ]
       ],
       "css-font-face.https.sub.tentative.html": [
-       "332effeb1f80a550f3260c3bb7887aa552db1133",
+       "481355c0a6ca71e72383e4ee9317d767a788177e",
        [
         null,
         {}
        ]
       ],
       "css-font-face.sub.tentative.html": [
-       "8a0b90cee103db90bde5bda3b16fc0e7f26391ed",
+       "a0d2a06fed3e755706780007b99a209353be4503",
        [
         null,
         {}
        ]
       ],
       "css-images.https.sub.tentative.html": [
-       "3fa240192894e083e454b97d16651412b99a22fe",
+       "63dcb4bf027a6a243afd1cfed1f36c3efa0ed556",
        [
         null,
         {
@@ -633654,7 +635533,7 @@
        ]
       ],
       "css-images.sub.tentative.html": [
-       "f1ef27cf08730e719cffdd959b766fa5ef00db91",
+       "2f6f2f75f1b9a027dc441577b8547ba87edee231",
        [
         null,
         {
@@ -633663,7 +635542,7 @@
        ]
       ],
       "element-a.https.sub.html": [
-       "dffd36c73ee373f039741fa75e33b2c007ba5912",
+       "6bc5069276145ffce8e92a2ccbd361ec0f09f27e",
        [
         null,
         {
@@ -633673,7 +635552,7 @@
        ]
       ],
       "element-a.sub.html": [
-       "0661de3c871bb4dfc8d3234325c2c60a787b8f48",
+       "389d3393b6450921901a1bb2848b065a4925d101",
        [
         null,
         {
@@ -633682,7 +635561,7 @@
        ]
       ],
       "element-area.https.sub.html": [
-       "be3f5f9b621176dd27bd917148cd697e8b3f4cdf",
+       "2355cceda09316f1af3d85c115ad7e42846325b1",
        [
         null,
         {
@@ -633692,7 +635571,7 @@
        ]
       ],
       "element-area.sub.html": [
-       "5f5c338324f0014486f9300dcc9fcf5d54abed6d",
+       "1932a66cc0991f5520d11d095efcf01e54704519",
        [
         null,
         {
@@ -633701,35 +635580,35 @@
        ]
       ],
       "element-audio.https.sub.html": [
-       "a9d951233e296f3405fdc3a9c3156c9b4934a150",
+       "f0ce53cbd151b0023ad30d2bb1bb590dd9c8307c",
        [
         null,
         {}
        ]
       ],
       "element-audio.sub.html": [
-       "2b62632ac2eb8cdc071ed27c45b11ea645addf1e",
+       "efe9164c6d23c7b9114fbec2b8160e9fd3bfc435",
        [
         null,
         {}
        ]
       ],
       "element-embed.https.sub.html": [
-       "819bed888ee4cbd8b4bff5290e779ca9440a8a25",
+       "2aea58d0b4de6fea15f85e98e2298b079752316c",
        [
         null,
         {}
        ]
       ],
       "element-embed.sub.html": [
-       "b6e14a55e4a54966c103ed3f743eb3767b8a5e7d",
+       "e394d4d7f9acba2aad39d135bb22c98900ad7536",
        [
         null,
         {}
        ]
       ],
       "element-frame.https.sub.html": [
-       "17504ff5635c4b089ac248c7619d235cf9155544",
+       "7df86fb7b4bdf710cda37d002560f3fbe0f8dcb4",
        [
         null,
         {
@@ -633738,14 +635617,14 @@
        ]
       ],
       "element-frame.sub.html": [
-       "2d9a7ec97d7808347044a82249ff7f6c6c06cbef",
+       "6a10ca2b34d7f77c68095425f9c6b1d125e2a157",
        [
         null,
         {}
        ]
       ],
       "element-iframe.https.sub.html": [
-       "fba1c8b9e02f19d40859399d461886f10010c96b",
+       "10de00614808d54c08f2acb4e8e5ce6652708c98",
        [
         null,
         {
@@ -633754,56 +635633,56 @@
        ]
       ],
       "element-iframe.sub.html": [
-       "6f71cc0d25473771661e52f31ff1c3872970aafb",
+       "5d2f096a3fabc7b22e86e2d7b6981e0104aa68d2",
        [
         null,
         {}
        ]
       ],
       "element-img-environment-change.https.sub.html": [
-       "a19aa117c4f46e722c7d552e1c9dd6396df44c13",
+       "9e9c3723e9a5e706fb3b42ca472b20cf5c260638",
        [
         null,
         {}
        ]
       ],
       "element-img-environment-change.sub.html": [
-       "96658726ba0c9169484049622181f3737012103f",
+       "0d99cb3171ba4b90646d6eb93084f9f3c9901115",
        [
         null,
         {}
        ]
       ],
       "element-img.https.sub.html": [
-       "51d6e082b0e336e87b7d9646af2b2411da2d382b",
+       "5a0f2e4e2006a639a6a0f857b2d62fd2b2d99600",
        [
         null,
         {}
        ]
       ],
       "element-img.sub.html": [
-       "5a4b152c5525b3dabd1dcc5fe9badad54f18240b",
+       "23008791d7f9eef43d2b5f3945d1487df0d860cd",
        [
         null,
         {}
        ]
       ],
       "element-input-image.https.sub.html": [
-       "7fa674043e2517da8b2db97822cac0210645ccde",
+       "b5537eec60e37b69096916fe7b836b2a67cc9961",
        [
         null,
         {}
        ]
       ],
       "element-input-image.sub.html": [
-       "fb2a146b199dba29a8f68a1dddad51e4e76b3d39",
+       "6f8743633fa6900084a82dff29ff60b05d921be1",
        [
         null,
         {}
        ]
       ],
       "element-link-icon.https.sub.html": [
-       "b2449607553e411d08bfc3879de55ec9239c930a",
+       "b41f0afe4a8db72ac20b4376c173599b82d6ca94",
        [
         null,
         {
@@ -633812,7 +635691,7 @@
        ]
       ],
       "element-link-icon.sub.html": [
-       "e9226c190a508991d33da40267350af45de05396",
+       "ea9ecb4ffe0ce25e4a899f2b8e5a02f63e545010",
        [
         null,
         {
@@ -633821,7 +635700,7 @@
        ]
       ],
       "element-link-prefetch.https.optional.sub.html": [
-       "bdd684a26799688f0f3c8ce00c569ecc6de498ad",
+       "16347abc825d1917ea24c80113d9c8359857efe2",
        [
         null,
         {
@@ -633830,7 +635709,7 @@
        ]
       ],
       "element-link-prefetch.optional.sub.html": [
-       "c2244883cc9077fe1e688d41f4d490c7c6001b65",
+       "c938671760270d8695d15bec08dccb34b45f7bd9",
        [
         null,
         {
@@ -633839,77 +635718,77 @@
        ]
       ],
       "element-meta-refresh.https.optional.sub.html": [
-       "3a1a8eb49af62ac8f0c14b1198f80e0c450279a0",
+       "7f763d630a396e4c9d9b7a73aee72e07358db684",
        [
         null,
         {}
        ]
       ],
       "element-meta-refresh.optional.sub.html": [
-       "df3e92e2c8fdeb71689d53487fb3681357ada987",
+       "c1f3ecbbf8604d75d52f402f9be6978ff8a21e23",
        [
         null,
         {}
        ]
       ],
       "element-picture.https.sub.html": [
-       "ba6636a019a304a410a957d553adae674a9003e9",
+       "2de087218ac03e5ae14904ade37fb98314279ceb",
        [
         null,
         {}
        ]
       ],
       "element-picture.sub.html": [
-       "64f851c682b4662f46daf8981c89134f51caf771",
+       "f0e087483d59b40631fb414dff9d1ead1e0bee3d",
        [
         null,
         {}
        ]
       ],
       "element-script.https.sub.html": [
-       "dcdcba2792d5c357edebd6a1100bf27964e108c9",
+       "e52b165b74744d7cd942505c5ca7334fa4c50cd5",
        [
         null,
         {}
        ]
       ],
       "element-script.sub.html": [
-       "a2526698fbdaa4d5fc6b185f866a2953bd796c66",
+       "47ed5fa9f8faaef0fffdd415510ed3de7bc82efd",
        [
         null,
         {}
        ]
       ],
       "element-video-poster.https.sub.html": [
-       "5805b46bd0cd67310b243c6595f4d1f9052a6b9f",
+       "ddd870af7c2ac1a657592886d8cdebbec4057427",
        [
         null,
         {}
        ]
       ],
       "element-video-poster.sub.html": [
-       "e6cc5ee7e0695dcf97d4ea919644ab553c6304ed",
+       "aeb3d4f9b5e8e198225c65d7939d182ed46ec83b",
        [
         null,
         {}
        ]
       ],
       "element-video.https.sub.html": [
-       "971360dceea4a098ee0cb34995e795f45ab2f243",
+       "c900807820c692defb6632d1f5554ef40e7424e9",
        [
         null,
         {}
        ]
       ],
       "element-video.sub.html": [
-       "9707413ab68b170c9df22f2c9d112cb969f734b9",
+       "bf357e9da0e6828ddbe75011fd9cba4a0a5d35db",
        [
         null,
         {}
        ]
       ],
       "fetch-via-serviceworker.https.sub.html": [
-       "22f930960d6d3da0af5eb9c3ff202dac28c108f5",
+       "c3b0599b9da76719e74c8b7f4797eab526cecad9",
        [
         null,
         {
@@ -633918,21 +635797,21 @@
        ]
       ],
       "fetch.https.sub.html": [
-       "dde1daede4ec3c0276f6e52151755999d56c6d3f",
+       "486f404d4bdf42cb7b50cffcdabb2c2a4755a957",
        [
         null,
         {}
        ]
       ],
       "fetch.sub.html": [
-       "d28ea9bb9004f20f3737370390ab30de84e7ea40",
+       "7d9536efcfbdfeefc15fe30646a05caeeb5dad63",
        [
         null,
         {}
        ]
       ],
       "form-submission.https.sub.html": [
-       "988b07c74a948ffe037c9bdf221af9f5a69a7ff3",
+       "0935f8461118d966f5a3e9b6cc9f1de3756ffc7c",
        [
         null,
         {
@@ -633942,7 +635821,7 @@
        ]
       ],
       "form-submission.sub.html": [
-       "f862062aebcd3046d179551d349d0c08cc47638c",
+       "b0f56f609429ad968ab6da282355b5a13bdc07ee",
        [
         null,
         {
@@ -633951,7 +635830,7 @@
        ]
       ],
       "header-link.https.sub.html": [
-       "09f011389559bfc004d6337ad5bb2d5523d82ee5",
+       "8e7d029dc2528721206c691c6894ca410a74e8ee",
        [
         null,
         {}
@@ -633965,14 +635844,14 @@
        ]
       ],
       "header-link.sub.html": [
-       "8b6cdae0edad7b7090bab8bdf2785c577c186573",
+       "b0823071345e8f5ab0edaa66bdb85699c46787bc",
        [
         null,
         {}
        ]
       ],
       "header-refresh.https.optional.sub.html": [
-       "e63ee423cd74a925d60084aa6aef27fae0daff73",
+       "0f7e9e42b79b3980e2a4badbe366ee1613f7db6d",
        [
         null,
         {
@@ -633981,7 +635860,7 @@
        ]
       ],
       "header-refresh.optional.sub.html": [
-       "4674ada9c6da1566e1031a347d2512086966f9e7",
+       "873013e821c225fc7f49c37ca2c04ca4cb20c482",
        [
         null,
         {
@@ -633990,28 +635869,28 @@
        ]
       ],
       "script-module-import-dynamic.https.sub.html": [
-       "72d60fc30cb5f09acc3e65562483c67f9d415613",
+       "94ef41b9228dfec5871f93f2049e3a831946762d",
        [
         null,
         {}
        ]
       ],
       "script-module-import-dynamic.sub.html": [
-       "088720c23e0db4aabaefed152f1bbd318ad73563",
+       "16aefa11176bac6f86c1536ffc87b7300b7dc7ce",
        [
         null,
         {}
        ]
       ],
       "script-module-import-static.https.sub.html": [
-       "cea3464f80701a166a4508394645b0f493951c64",
+       "62968f318f5f5c1d41d62e3decfcb500b695322c",
        [
         null,
         {}
        ]
       ],
       "script-module-import-static.sub.html": [
-       "0f94f71cf6f186fb101c9236d28a9f2adc88f083",
+       "c4da15766067b81899787302c53bb6a388e88894",
        [
         null,
         {}
@@ -634025,7 +635904,7 @@
        ]
       ],
       "svg-image.https.sub.html": [
-       "b059eb31456dfc5721bc450b2d741dfec2fe647b",
+       "9dd0da15f9d31080b5495297ad0df57e873addb7",
        [
         null,
         {
@@ -634034,7 +635913,7 @@
        ]
       ],
       "svg-image.sub.html": [
-       "a28bbb12eb71ecbf3d92e4dfad9aea0ce2ae9fc9",
+       "56427bedaa68e39aaa37d3eaa746b11dcf4da672",
        [
         null,
         {
@@ -634043,14 +635922,14 @@
        ]
       ],
       "window-history.https.sub.html": [
-       "c2b3079a6d3670eb7cece217c961ff13d2f96142",
+       "64e282e778945e2431d049b7d44ea6145b2a143c",
        [
         null,
         {}
        ]
       ],
       "window-history.sub.html": [
-       "333d90c28609bd907393124dfe7d6658e3967f9f",
+       "836704964773b5cb8daf9df4e5ad2673decfdbb7",
        [
         null,
         {
@@ -634059,7 +635938,7 @@
        ]
       ],
       "window-location.https.sub.html": [
-       "4a0d2fdc068078760a613ca0541770635d64fb3d",
+       "387039bcf2562720085ef0ae4a9ffd586f13f2dd",
        [
         null,
         {
@@ -634069,7 +635948,7 @@
        ]
       ],
       "window-location.sub.html": [
-       "bb3e6805cb0114c7a659fb7a37c24af9b7c00524",
+       "e307b909dce18213c29491dbcf7e2723d6825d45",
        [
         null,
         {
@@ -634085,21 +635964,21 @@
        ]
       ],
       "worker-dedicated-constructor.sub.html": [
-       "65b1837c6363a249bf0f249eed726432cd1bcca6",
+       "e05e12df3959daf1439a24756b9e1231be2e4e76",
        [
         null,
         {}
        ]
       ],
       "worker-dedicated-importscripts.https.sub.html": [
-       "0cd9f35d5825353f541702ea0193ddef31a6a50f",
+       "5b48e59e716b9043586c7210252973755ed8fde4",
        [
         null,
         {}
        ]
       ],
       "worker-dedicated-importscripts.sub.html": [
-       "0555bbaf432696a8d1f95cfb483f84801bdddb00",
+       "ad4792b8a60c4223533fde600907e2ed238fcca2",
        [
         null,
         {}
@@ -662585,6 +664464,20 @@
      },
      "windows": {
       "auxiliary-browsing-contexts": {
+       "named-lookup-scoped-to-browsing-context-group.html": [
+        "0450d479196a19535419c286fa2447580b344b25",
+        [
+         null,
+         {}
+        ]
+       ],
+       "no-proactive-swap-when-other-contexts-in-group.html": [
+        "5f4e0da690b931952256b280782c6b1934337ea6",
+        [
+         null,
+         {}
+        ]
+       ],
        "opener-closed.html": [
         "106c3f97cb231aeadc7a09a22f402ba631fe8882",
         [
@@ -662742,6 +664635,13 @@
          null,
          {}
         ]
+       ],
+       "duplicate-name-order.html": [
+        "95b461d4edde78ab6f346219dc5b37cf99878267",
+        [
+         null,
+         {}
+        ]
        ]
       },
       "browsing-context-window.html": [
@@ -670234,27 +672134,6 @@
          {}
         ]
        ],
-       "2d.text.measure.caret-position-edge-cases.tentative.html": [
-        "6628c9394683bf20394a94b3ca952453d18be7b1",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.text.measure.caret-position-edges.tentative.html": [
-        "cd56e20bb980a67543b361004990ee12d3c060bd",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.text.measure.caret-position.tentative.html": [
-        "4b223c8a0a356833ef0d8ad51e8cb3a915a328eb",
-        [
-         null,
-         {}
-        ]
-       ],
        "2d.text.measure.emHeights-low-ascent.html": [
         "8eb49ff8adda5be92719defaaf4a97844c6b7d82",
         [
@@ -670325,6 +672204,27 @@
          {}
         ]
        ],
+       "2d.text.measure.index-from-offset-edge-cases.tentative.html": [
+        "b7a327aeaae1997a6b70dc6ad4224911ce4b806d",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.text.measure.index-from-offset-edges.tentative.html": [
+        "842f50857cca530b130dd85f9e5a57204113875f",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.text.measure.index-from-offset.tentative.html": [
+        "9893fcdc4c293dbbdcac9795beb1e18b8f433bfc",
+        [
+         null,
+         {}
+        ]
+       ],
        "2d.text.measure.selection-rects-baselines.tentative.html": [
         "8ef5e83199c395d1de79b7730b47c2c9342d074e",
         [
@@ -670367,6 +672267,13 @@
          {}
         ]
        ],
+       "2d.text.measure.text-clusters-rendering-options.tentative.html": [
+        "10a433cc61bd029e3c05a686c7b4f2c256e877e7",
+        [
+         null,
+         {}
+        ]
+       ],
        "2d.text.measure.text-clusters-split.tentative.html": [
         "63c7cce72be7c1ede567c2f00001d7a57addadbc",
         [
@@ -683853,41 +685760,6 @@
          {}
         ]
        ],
-       "2d.text.measure.caret-position-edge-cases.tentative.html": [
-        "a9bf8b4de5990da8da9eb33a35cc5f6a0af5476c",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.text.measure.caret-position-edge-cases.tentative.worker.js": [
-        "835392228363b63c175f6d9e17bd247bbe67dffe",
-        [
-         "html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.html",
-         {}
-        ]
-       ],
-       "2d.text.measure.caret-position-edges.tentative.html": [
-        "a6e45274c7300aa9f407c605e41108559f92f6c8",
-        [
-         null,
-         {}
-        ]
-       ],
-       "2d.text.measure.caret-position-edges.tentative.worker.js": [
-        "2cef8432d2a2eb6fa9057d6a593cc7e2f0a2ae3f",
-        [
-         "html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.worker.html",
-         {}
-        ]
-       ],
-       "2d.text.measure.caret-position.tentative.html": [
-        "3c1873aaf1f27b17da19860c693b0ce006cc6da2",
-        [
-         null,
-         {}
-        ]
-       ],
        "2d.text.measure.emHeights-low-ascent.html": [
         "229f558bf2d4b07a9fd0b29a54067ceb4f0a3367",
         [
@@ -684028,6 +685900,41 @@
          {}
         ]
        ],
+       "2d.text.measure.index-from-offset-edge-cases.tentative.html": [
+        "5f0236bfa87e5af74939bcaa8bfb0832e306206f",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.text.measure.index-from-offset-edge-cases.tentative.worker.js": [
+        "ae08c78d07a2adfe5f80457373b8b589589ab3f3",
+        [
+         "html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.worker.html",
+         {}
+        ]
+       ],
+       "2d.text.measure.index-from-offset-edges.tentative.html": [
+        "fbefdd5804cd3fe3ad6cf9a94f68ad89767ac5e4",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.text.measure.index-from-offset-edges.tentative.worker.js": [
+        "2ec89e84b516f9515f8e68a3e6fcd39733b018b2",
+        [
+         "html/canvas/offscreen/text/2d.text.measure.index-from-offset-edges.tentative.worker.html",
+         {}
+        ]
+       ],
+       "2d.text.measure.index-from-offset.tentative.html": [
+        "18e42aff3c385f747d63e580ed3929d34e8bf9e2",
+        [
+         null,
+         {}
+        ]
+       ],
        "2d.text.measure.selection-rects-baselines.tentative.html": [
         "fc1683bcce17a948e3580a64357da5a7927ce289",
         [
@@ -684105,6 +686012,20 @@
          {}
         ]
        ],
+       "2d.text.measure.text-clusters-rendering-options.tentative.html": [
+        "645013528e81734cffba84f4231a1ce293152892",
+        [
+         null,
+         {}
+        ]
+       ],
+       "2d.text.measure.text-clusters-rendering-options.tentative.worker.js": [
+        "f55d2c4655641d1c05bc14b9f210889f247c49e3",
+        [
+         "html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.worker.html",
+         {}
+        ]
+       ],
        "2d.text.measure.text-clusters-split.tentative.html": [
         "6a5fd475795e140ff8b8533b8d070baf97f0ebfe",
         [
@@ -690673,266 +692594,266 @@
        ]
       ],
       "element-render-blocking-001.html": [
-       "36567f9d54adea41a703b23adac438e160f397cf",
+       "b166cbd23c8acd7d788dbaaf2d4f2a16a94c8441",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-002.html": [
-       "3c907597f7ac35b84e29ccd37627499c347f511a",
+       "bfb75a5afd224c1f7b84685982f1c9aa16adff0f",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-003.html": [
-       "2858798a35f58e1152b7047c35359878d1820ecc",
+       "12fbb56b8b5e78e2d5275ae42bf0906aae188619",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-004.html": [
-       "f45f5587204674691349f298f9367204233aa235",
+       "3c908bfa2f3fa5c24d30fe7358b5a09c7feed70f",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-005.html": [
-       "098a3c57676cc88788a23efa0818e00b9a8e6344",
+       "4fdfd8877db707dfe32c25794bec8e8e267a9dff",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-006.html": [
-       "223e42109e5c65985e0aec2b0c24ef8f1d810d15",
+       "925a013d90d4082187fa07c41a76811cb1408214",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-007.html": [
-       "9aa0aeea79834833ff0151227723c1a6c17e06e2",
+       "4762d1259a92ef08b5eed713c1e42ad045435aab",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-008.html": [
-       "e671dda19c43b44d3f065b8de0e68f7326e88aba",
+       "4756cd4844dc149d086db42610e337785d2760db",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-009.html": [
-       "8498816ea5c435cce0ea3d597b7f0b381d73d7f6",
+       "d2a0470ee0382d218a1c54af24de11102faf4d39",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-010.html": [
-       "ef6f709012e4bd4bb222b8cc74317abdbc40768f",
+       "2eb60dbef8119fd189ce5042856b0c5f245d66f4",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-011.html": [
-       "dee82d8c5950c16360d2ff799393a50bed1f7a95",
+       "2ea636572476b5b4d1876c397e7ce5ab43d93d89",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-012.html": [
-       "4110e54c5f20420d8da783d21e43d2f9961aed5a",
+       "65209cb667c9a03a3c21e3c248efdc822be6e438",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-013.html": [
-       "ecd97be86a6633daf0d03f86f231de295abee459",
+       "27d724dc614dd8c3578a9a321c127fd37bbbdd92",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-014.html": [
-       "ea8948de42dec015384aa2bd7a13edb283b6d522",
+       "735f9ad86c701526c28a27974c0e836d55d36609",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-015.html": [
-       "a775ee417403ab3fef3635194ff1d62b4c335266",
+       "da6e76608973fa8d15dd0f09153e761eb5ba0ca9",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-016.html": [
-       "8968c5dacd329537b9d7c1d0d0ce38786077f583",
+       "9d836dfafdd3711897294c86fe079c736bff62d8",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-017.html": [
-       "2d3b5747216f50902714bff725cddf50ec7556c0",
+       "fff6c48b5813c07763e9037fb614746e35133914",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-018.html": [
-       "76e6394b5b16586de768ad553c671b8594d0635e",
+       "896e6efbbf6fa8976d26b13688d4177ea6931ae1",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-019.html": [
-       "80a7019edc4beb272ef65d7cd1d28f88fb18a813",
+       "709f8d05b06dc8279514f9cd0e91c3bd32f0dd02",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-020.html": [
-       "10019c943f402c91c0ca07efefe462d5bc6ece48",
+       "054430b960cb2be6820773c124c44c4255bad6b2",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-021.html": [
-       "1ca2114689a6cdbc961c9eecd1fa4e328117d431",
+       "11126b869add05a425e05332f8e19d914ad37658",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-022.html": [
-       "5dfbcac30a4c065a888f5ea804ba306758d83e6c",
+       "cecf88505fd38a6b8b91af1172ee96bc22b2a82f",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-023.html": [
-       "8fe8b6a8c8e30f05250c2ca569f5b4d938bed71c",
+       "3b52dce47032d702e65f0b0245d86a811c0a58cb",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-024.html": [
-       "19e4020fb769bb59053a6a64cc1c499583044c73",
+       "fae9e81a28d4a3a669fd161dc1b74a50bc2c10af",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-025.html": [
-       "689ae69f452d421b66554c8e547ca95f5f269af9",
+       "aebe11d949684d0b506832af566064458be30f5c",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-026.html": [
-       "6abfc43b8b237b3f8f0f6474d36fcce1c3aaac52",
+       "5755ef302d1f664506017d4c714269e52ccf6228",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-027.html": [
-       "56f88e0fc2b773f74afb86e306f42a1aa39d9c1b",
+       "f7b2d65e7eaf16557ef0dfd6a2c2d48e38816a6b",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-028.html": [
-       "a64d542c4ac7ef97a2e3427dabe485519da97518",
+       "9ec14bf9d9a87e88ab054226f02c6ee923ba340a",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-029.html": [
-       "44dff3cb8429d901b65f5991d3696abb31ff6831",
+       "5e6ee8c88c05b6a3e86ab5b99b17d7f11ff79a50",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-030.html": [
-       "307c2d303d045d090c180ae22476b1419b91d9bc",
+       "95c3cd20677aa0dba92c4f1732ba606a9311ab91",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-031.html": [
-       "2098483a0600c642f32403fff97be2bb4fed4572",
+       "0c061ad17a5e5223c5b0b4ceb21b4bd3e2fda6f2",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-032.html": [
-       "307c2d303d045d090c180ae22476b1419b91d9bc",
+       "95c3cd20677aa0dba92c4f1732ba606a9311ab91",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-033.html": [
-       "59d41c08c0a677e0e462c53e47e76635cb3bf9b1",
+       "c189dfd2b90864601bb849e31d25564864673ed0",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-034.html": [
-       "a505de48756a9fbf1b947e6e01be8020f9d2be23",
+       "0824550fd306fe839538856bc191618264e430d3",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-035.html": [
-       "050244c7a690cdc840505bf73173464e0aef69c9",
+       "3d05f729d4495d4d8fa72c52a677c5d8ca98d6cd",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-036.html": [
-       "83637b3a08b859b0fa46b3bfdab6edc8df86c7bb",
+       "c0a18b62dc6f6eb09a64fa3eb20f58a288920e42",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-037.html": [
-       "5fe469a2fdd3b6231a84cd842c1bea877f42bb14",
+       "f72daac4731dc9cd71e1904400bd41884fb1a5a4",
        [
         null,
         {}
        ]
       ],
       "element-render-blocking-038.html": [
-       "c7fabe7f320c4af2cbdb4089916796a9eb333874",
+       "8dad0a414ffa1755e41c4e3f17394dccf0b84422",
        [
         null,
         {}
@@ -701513,6 +703434,20 @@
          {}
         ]
        ],
+       "button-click-resets-with-commandfor.tentative.html": [
+        "a1e3669717e90c16d93b11cde663a73495c852a5",
+        [
+         null,
+         {}
+        ]
+       ],
+       "button-click-submits-with-commandfor.tentative.html": [
+        "ced0d9ef152d82920fee888947bba0484335585b",
+        [
+         null,
+         {}
+        ]
+       ],
        "button-click-submits.html": [
         "86b92402e46896917748c792d14ec1989fc1a4b8",
         [
@@ -702957,7 +704892,7 @@
          ]
         ],
         "select-events.tentative.html": [
-         "fcf53233f18d7f38c41880d5939cb1c245ce759d",
+         "a1f98bc05301f69e6d5029f21fdd27e0aef18dfc",
          [
           null,
           {
@@ -703075,7 +705010,7 @@
          ]
         ],
         "selectedcontent.tentative.html": [
-         "77ff46a3b33437584309d19e23567760a11faeb1",
+         "eef68a9237fb7f5e71345d3c2bcc1d77509d6156",
          [
           null,
           {
@@ -703925,7 +705860,7 @@
         ]
        ],
        "dialog-popover-closedby-complex.tentative.html": [
-        "0d300595287a144d37a1862139ef4cd615a8bee8",
+        "472e0329236f8bef807a3d722fe8b3ef0a603ac0",
         [
          null,
          {
@@ -703945,7 +705880,7 @@
         ]
        ],
        "dialog-requestclose.tentative.html": [
-        "eb2270b861c75e8318760b1ee6ce5398c780d780",
+        "5cbad9c651935e8296d1fad3c94433965b9303db",
         [
          null,
          {
@@ -704357,7 +706292,7 @@
        ]
       ],
       "invoketarget-button-event-dispatch.tentative.html": [
-       "ef870627a066f5dd85f29ce6ea664581ea0259fc",
+       "74148caa2107d3e99acc4f9223c19eaad9de4ec1",
        [
         null,
         {
@@ -704673,6 +706608,13 @@
          {}
         ]
        ],
+       "rel-opener-prevents-browsing-context-group-change.tentative.html": [
+        "94a9c2d3944c25318c4087be5cb8a8f64cf20591",
+        [
+         null,
+         {}
+        ]
+       ],
        "target_blank_implicit_noopener.html": [
         "73eebaff70f09bb98a3b7dd6b59f9357a3ab0668",
         [
@@ -705104,10 +707046,12 @@
        ]
       ],
       "popover-minimum-role.html": [
-       "8606f983969b9fc94e2684073a4946e9358e3507",
+       "b46ca81fb526d828ce15806850999d002cc01ab0",
        [
         null,
-        {}
+        {
+         "testdriver": true
+        }
        ]
       ],
       "popover-move-documents.html": [
@@ -711554,6 +713498,18 @@
       ]
      },
      "speculative-parsing": {
+      "expect-no-linked-resources": {
+       "no-speculative-fetch.tentative.optional.html": [
+        "33a14ff14662f7100073342fff46c2a28099a3f8",
+        [
+         null,
+         {
+          "testdriver": true,
+          "timeout": "long"
+         }
+        ]
+       ]
+      },
       "generated": {
        "document-write": {
         "base-href-script-src.tentative.sub.html": [
@@ -716024,6 +717980,13 @@
       {}
      ]
     ],
+    "external-import-map-errors.html": [
+     "ea2a1c058755deb0646505ed3b4909a4a123cb25",
+     [
+      null,
+      {}
+     ]
+    ],
     "http-url-like-specifiers.sub.html": [
      "ba5182354cbcdda4386eea7730701a45460c443c",
      [
@@ -717696,6 +719659,13 @@
       }
      ]
     ],
+    "input-events-range-exceptions.tentative.html": [
+     "d2a2b66bea9fd9a852cf816ea2de107fd0014cc9",
+     [
+      null,
+      {}
+     ]
+    ],
     "input-events-spin-button-click-on-number-input-delete-document.html": [
      "fb3655398dbd1bdde84f032df392b6352b7fcafe",
      [
@@ -719558,7 +721528,7 @@
      ]
     ],
     "first-paint-equals-lcp-text.html": [
-     "50bccd072e2db5c7f2865a8e2cf36aa30264ac21",
+     "c71e86f9c2a05be6dc3b02d886a43f920497ca1a",
      [
       null,
       {}
@@ -721454,6 +723424,15 @@
        }
       ]
      ],
+     "loaf-paint-mixin.html": [
+      "a0ef8df5bd322c8b8ecbf6b94db3e56f479837ba",
+      [
+       null,
+       {
+        "timeout": "long"
+       }
+      ]
+     ],
      "loaf-pause-duration.html": [
       "fcc13e17983acafd106882d9dcf6e17a7f5d71f9",
       [
@@ -721583,7 +723562,7 @@
       ]
      ],
      "loaf-timeline.html": [
-      "c434a26ef8d18aa84836dbef56f737df425beb57",
+      "721842e846bc416d3bb97035a759086e73c67b89",
       [
        null,
        {
@@ -730747,7 +732726,7 @@
      ]
     ],
     "nav2-test-timing-persistent.html": [
-     "d0fc8c073bfdcb057b0f6a1adda08763f8bb71c4",
+     "4a590b8fbb5ddcca30626913541d965e26066183",
      [
       null,
       {}
@@ -732350,7 +734329,7 @@
      ]
     ],
     "paint-timing-mixin.html": [
-     "837d45620b65c17e46c622209050a84ff48b63ae",
+     "65c1062a05912dc87d142a29cd493d92ac52d2bf",
      [
       null,
       {}
@@ -736770,6 +738749,15 @@
       }
      ]
     ],
+    "pointerevent_click_on_chorded_mouse_button.tentative.html": [
+     "4c6431751070d166882db8cd6af7dd312585f6f6",
+     [
+      null,
+      {
+       "testdriver": true
+      }
+     ]
+    ],
     "pointerevent_constructor.html": [
      "af7345fafce93562507ae1290d02b195f8d1ae1e",
      [
@@ -754953,6 +756941,13 @@
        {}
       ]
      ],
+     "animation-range-scroll-timeline.html": [
+      "a1ff45e2a2f671bf4a84abc68044b6b133f320a4",
+      [
+       null,
+       {}
+      ]
+     ],
      "animation-shorthand.html": [
       "144fc5773fd5c75af30d74775a75ec9e7e478396",
       [
@@ -755240,6 +757235,13 @@
        {}
       ]
      ],
+     "siblings-with-anonymous-timelines.html": [
+      "cc392856d0fea9193f2b142a99714dbb657deb26",
+      [
+       null,
+       {}
+      ]
+     ],
      "timeline-offset-in-keyframe-change-timeline.tentative.html": [
       "5a70820b881edf687961606f79153dab96d6ac2d",
       [
@@ -767725,7 +769727,7 @@
      ]
     ],
     "requestStorageAccess-cross-origin-iframe-navigation-relax.sub.https.window.js": [
-     "7ccb9824e699a3a269fa257b2c889d50f89d8f88",
+     "1cede45d59d8ef13ec40ab18ff107bf97ba1324a",
      [
       "storage-access-api/requestStorageAccess-cross-origin-iframe-navigation-relax.sub.https.window.html",
       {
@@ -767751,7 +769753,7 @@
      ]
     ],
     "requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js": [
-     "691c8c86b62005880c0babeb686cfc18113579ec",
+     "ce0d69cfaa54c77b7d60562b6d04884bf680dc1f",
      [
       "storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.html",
       {
@@ -768320,6 +770322,28 @@
       }
      ]
     ],
+    "storage-access-headers.tentative.https.sub.window.js": [
+     "1071975017449205071f4d91477991d7352a666d",
+     [
+      "storage-access-api/storage-access-headers.tentative.https.sub.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "helpers.js"
+        ],
+        [
+         "script",
+         "/resources/testdriver.js"
+        ],
+        [
+         "script",
+         "/resources/testdriver-vendor.js"
+        ]
+       ]
+      }
+     ]
+    ],
     "storage-access-permission.sub.https.window.js": [
      "2faec7b5fdbb1f4bf8e4b3aefe10acf16ac615bb",
      [
@@ -783268,6 +785292,20 @@
      }
     },
     "types": {
+     "SVGElement.ownerSVGElement-01.html": [
+      "8e064adeeb2d9c0f940fcdc8a9f74ed060e26436",
+      [
+       null,
+       {}
+      ]
+     ],
+     "SVGElement.ownerSVGElement-02.html": [
+      "46607034f2273e2e05cc8377d85664e893f3eb1d",
+      [
+       null,
+       {}
+      ]
+     ],
      "elements": {
       "SVGGeometryElement-rect.svg": [
        "93d25b6bfddb8c483044db3092d2c0e67ae0fac2",
@@ -784035,8 +786073,15 @@
       {}
      ]
     ],
-    "Element-setAttribute-respects-Elements-node-documents-globals-CSP.html": [
-     "aafe3c70313cb420a1efede51891f949d7aa33b8",
+    "Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-TT-realm.html": [
+     "0b2e6b60645c0ad5c25f0fdb4db488f0015267d8",
+     [
+      null,
+      {}
+     ]
+    ],
+    "Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-non-TT-realm.html": [
+     "6543ddb4b8be1cd54cc14b0a0c36853e1c53fc94",
      [
       null,
       {}
@@ -784050,7 +786095,7 @@
      ]
     ],
     "Element-setAttributeNS.html": [
-     "67e8236febd77ed3b544126d8c5f9dd37cc513ab",
+     "537b08be89b4e198e09851dbe927d6b6d2d69a48",
      [
       null,
       {}
@@ -784355,7 +786400,7 @@
      ]
     ],
     "block-string-assignment-to-Element-setAttributeNS.html": [
-     "78c8c0db9893802284093998b35df833b627e76b",
+     "ba9bcc20d242ba46ddea17425fcb690762b53fd1",
      [
       null,
       {}
@@ -784494,6 +786539,13 @@
       {}
      ]
     ],
+    "eval-function-constructor-untrusted-arguments-and-default-policy-throwing.html": [
+     "a33fe2d0eb45329627f4591ad69fb3ae9c1089af",
+     [
+      null,
+      {}
+     ]
+    ],
     "eval-function-constructor.html": [
      "1ad0fc7e680f9f0a91a651c6eede08a6f3a6afd2",
      [
@@ -784639,7 +786691,7 @@
      ]
     ],
     "trusted-types-event-handlers.html": [
-     "8dd70757e34d8984bd829c0428f3e41f3c6ef405",
+     "3e41e02a4626d0bd7ae9698d6b3c3a98e927b245",
      [
       null,
       {}
@@ -794216,8 +796268,69 @@
         }
        ]
       ],
+      "notraps.any.js": [
+       "4060885f36cb6acbf24403962d5a2192c8e278f7",
+       [
+        null,
+        {
+         "jsshell": true,
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/jspi/testharness-additions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/jspi/notraps.any.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/jspi/testharness-additions.js"
+          ]
+         ]
+        }
+       ],
+       [
+        "wasm/jsapi/jspi/notraps.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,jsshell"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/wasm-module-builder.js"
+          ],
+          [
+           "script",
+           "/wasm/jsapi/jspi/testharness-additions.js"
+          ]
+         ]
+        }
+       ]
+      ],
       "rejects.any.js": [
-       "443153193180a31b9869ebc1d3d1f6bbeb96fec9",
+       "55c5abc9a8a6ca563269dd4b885332641ad87b49",
        [
         null,
         {
@@ -811794,6 +813907,97 @@
         }
        ]
       ],
+      "DOMException-is-error.any.js": [
+       "6f3097b222ed1feb56e1b53606b403944421029d",
+       [
+        "webidl/ecmascript-binding/es-exceptions/DOMException-is-error.any.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,shadowrealm"
+          ]
+         ]
+        }
+       ],
+       [
+        "webidl/ecmascript-binding/es-exceptions/DOMException-is-error.any.shadowrealm-in-dedicatedworker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,shadowrealm"
+          ]
+         ]
+        }
+       ],
+       [
+        "webidl/ecmascript-binding/es-exceptions/DOMException-is-error.any.shadowrealm-in-shadowrealm.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,shadowrealm"
+          ]
+         ]
+        }
+       ],
+       [
+        "webidl/ecmascript-binding/es-exceptions/DOMException-is-error.any.shadowrealm-in-sharedworker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,shadowrealm"
+          ]
+         ]
+        }
+       ],
+       [
+        "webidl/ecmascript-binding/es-exceptions/DOMException-is-error.any.shadowrealm-in-window.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,shadowrealm"
+          ]
+         ]
+        }
+       ],
+       [
+        "webidl/ecmascript-binding/es-exceptions/DOMException-is-error.any.worker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,shadowrealm"
+          ]
+         ]
+        }
+       ],
+       [
+        "webidl/ecmascript-binding/es-exceptions/DOMException-is-error.https.any.shadowrealm-in-audioworklet.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,shadowrealm"
+          ]
+         ]
+        }
+       ],
+       [
+        "webidl/ecmascript-binding/es-exceptions/DOMException-is-error.https.any.shadowrealm-in-serviceworker.html",
+        {
+         "script_metadata": [
+          [
+           "global",
+           "window,dedicatedworker,shadowrealm"
+          ]
+         ]
+        }
+       ]
+      ],
       "exceptions.html": [
        "d26c66266994b2e349b4c81d42bc2f66353e6840",
        [
@@ -819214,7 +821418,7 @@
       ]
      ],
      "gemm.https.any.js": [
-      "7f8181dd5dd9fed9d1920cf3a6e34bfea051c298",
+      "86912305f9a5e8a7f246a2410904900534df2f44",
       [
        "webnn/conformance_tests/gemm.https.any.html?cpu",
        {
@@ -821404,7 +823608,7 @@
       ]
      ],
      "layer_normalization.https.any.js": [
-      "01f181c45b37c717d1325548967325c8412440f8",
+      "2af128bbaf9485e459aaec5a8eb9a41b8484183f",
       [
        "webnn/conformance_tests/layer_normalization.https.any.html?cpu",
        {
@@ -823813,7 +826017,7 @@
       ]
      ],
      "lstm_cell.https.any.js": [
-      "8fb7ce4ca35c0b138dabca6773409258aedd7fa1",
+      "7a484ec6af18c4b28eed284b3f61fe7f0259c009",
       [
        "webnn/conformance_tests/lstm_cell.https.any.html?cpu",
        {
@@ -824032,7 +826236,7 @@
       ]
      ],
      "matmul.https.any.js": [
-      "8a16c567c8afb9143a7226729223ff14a7f1587d",
+      "8d0ff1517bac15466b4630871a464b21e0c18d42",
       [
        "webnn/conformance_tests/matmul.https.any.html?cpu",
        {
@@ -848106,10 +850310,11 @@
       ]
      ],
      "setParameters-maxFramerate.https.html": [
-      "e404787dbd8ace1445a3f860d735cf0593d57821",
+      "a1a167e059224cb3de65b8118ef84a397ac550b8",
       [
        null,
        {
+        "testdriver": true,
         "timeout": "long"
        }
       ]
@@ -894220,7 +896425,7 @@
          ]
         ],
         "navigation.py": [
-         "21109f1a6805f516d7d43720aab1d547daedc550",
+         "e40c582b05f4e54f89def30b44688b51f9096143",
          [
           null,
           {}
@@ -894241,7 +896446,7 @@
          ]
         ],
         "pointer_mouse_drag.py": [
-         "7cd2e386c67ee435401ee672d1ce142510d0bb38",
+         "df4a98c2f8a95510b6164b4ba6cb1317a8e48552",
          [
           null,
           {
@@ -895279,7 +897484,7 @@
          ]
         ],
         "partition.py": [
-         "4e0ca081bcde01374a6aeb44b03f91cd795dbcfa",
+         "07057967b67636d30cdf32c48dd10de597472f7e",
          [
           null,
           {}
@@ -896627,7 +898832,7 @@
         ]
        ],
        "navigation.py": [
-        "6f5a4c98f0aecc8032856862e3bb8866885057e7",
+        "530327c0dbba09f9e44dc357b448a1faf583bd58",
         [
          null,
          {}
@@ -896669,7 +898874,7 @@
         ]
        ],
        "pointer_mouse.py": [
-        "a3ff8ae80a9845fc840313adc8be627f1fb6cfd3",
+        "a3dff9ec9c51f90c65f587f9ed3e0f325decd6a2",
         [
          null,
          {}
diff --git a/tests/wpt/meta/css/css-cascade/scope-nesting.html.ini b/tests/wpt/meta/css/css-cascade/scope-nesting.html.ini
index 6847b207043..34bbf10f158 100644
--- a/tests/wpt/meta/css/css-cascade/scope-nesting.html.ini
+++ b/tests/wpt/meta/css/css-cascade/scope-nesting.html.ini
@@ -61,3 +61,6 @@
 
   [Insert a CSSNestedDeclarations rule directly in top-level @scope]
     expected: FAIL
+
+  [Mutating selectorText on outer style rule causes correct inner specificity]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-for-cue.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-for-cue.html.ini
deleted file mode 100644
index 126aa466d08..00000000000
--- a/tests/wpt/meta/css/css-conditional/container-queries/container-for-cue.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[container-for-cue.html]
-  expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/container-units-auto.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/container-units-auto.html.ini
new file mode 100644
index 00000000000..7ce3b9710fa
--- /dev/null
+++ b/tests/wpt/meta/css/css-conditional/container-queries/container-units-auto.html.ini
@@ -0,0 +1,3 @@
+[container-units-auto.html]
+  [Resolving cqh against a auto height size container should be 0]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-conditional/container-queries/size-container-auto-height.html.ini b/tests/wpt/meta/css/css-conditional/container-queries/size-container-auto-height.html.ini
new file mode 100644
index 00000000000..762614fc251
--- /dev/null
+++ b/tests/wpt/meta/css/css-conditional/container-queries/size-container-auto-height.html.ini
@@ -0,0 +1,3 @@
+[size-container-auto-height.html]
+  [auto height size container matches zero height query]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/aspect-ratio-intrinsic-size-010.html.ini b/tests/wpt/meta/css/css-flexbox/aspect-ratio-intrinsic-size-010.html.ini
new file mode 100644
index 00000000000..a18ae233d01
--- /dev/null
+++ b/tests/wpt/meta/css/css-flexbox/aspect-ratio-intrinsic-size-010.html.ini
@@ -0,0 +1,2 @@
+[aspect-ratio-intrinsic-size-010.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-flexbox/flexbox-flex-wrap-flexing-003.html.ini b/tests/wpt/meta/css/css-flexbox/flexbox-flex-wrap-flexing-003.html.ini
new file mode 100644
index 00000000000..a7c25a58a70
--- /dev/null
+++ b/tests/wpt/meta/css/css-flexbox/flexbox-flex-wrap-flexing-003.html.ini
@@ -0,0 +1,2 @@
+[flexbox-flex-wrap-flexing-003.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html.ini b/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html.ini
index b102e6ad5c5..01d7cacac97 100644
--- a/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html.ini
+++ b/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html.ini
@@ -25,3 +25,39 @@
 
   [Property column-rule-style value 'inset']
     expected: FAIL
+
+  [Property column-rule-style value 'dotted dashed solid']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(10, double)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(3, groove) repeat(4, ridge)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(auto, solid)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(auto, dotted solid inset)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(4, none ridge solid) repeat(auto, hidden)']
+    expected: FAIL
+
+  [Property column-rule-style value 'inset repeat(auto, solid ridge) repeat(4, none groove hidden)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(calc(5 + 3), ridge)']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(4, dotted double dashed) repeat(auto, solid) ridge']
+    expected: FAIL
+
+  [Property column-rule-style value 'repeat(4, dotted double dashed) repeat(auto, solid) repeat(4, none groove hidden)']
+    expected: FAIL
+
+  [Property column-rule-style value 'ridge repeat(auto, solid)']
+    expected: FAIL
+
+  [Property column-rule-style value 'ridge repeat(auto, solid) ridge']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-style-valid.html.ini b/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-style-valid.html.ini
new file mode 100644
index 00000000000..24662e9600e
--- /dev/null
+++ b/tests/wpt/meta/css/css-gaps/tentative/parsing/gap-decorations-style-valid.html.ini
@@ -0,0 +1,45 @@
+[gap-decorations-style-valid.html]
+  [e.style['column-rule-style'\] = "repeat(4, dotted)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(3, dashed double dotted)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(1, dashed double dotted solid)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "dashed" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(4, double)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "dotted ridge" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "dotted dashed solid groove ridge" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(3, groove) repeat(4, ridge)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "inset repeat(3, ridge) none repeat(4, groove hidden dashed)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(4, none ridge solid) repeat(5, hidden) double" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(auto, solid)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(auto, dotted solid inset)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(auto, dashed groove) ridge" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "repeat(4, dotted double dashed) repeat(auto, solid)" should set the property value]
+    expected: FAIL
+
+  [e.style['column-rule-style'\] = "inset repeat(auto, solid ridge) repeat(4, none groove hidden)" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/grid-definition/flex-item-grid-container-auto-repeat-002.html.ini b/tests/wpt/meta/css/css-grid/grid-definition/flex-item-grid-container-auto-repeat-002.html.ini
new file mode 100644
index 00000000000..a930aee9d98
--- /dev/null
+++ b/tests/wpt/meta/css/css-grid/grid-definition/flex-item-grid-container-auto-repeat-002.html.ini
@@ -0,0 +1,2 @@
+[flex-item-grid-container-auto-repeat-002.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-grid/parsing/grid-template-shorthand-composition.html.ini b/tests/wpt/meta/css/css-grid/parsing/grid-template-shorthand-composition.html.ini
deleted file mode 100644
index 1468f959658..00000000000
--- a/tests/wpt/meta/css/css-grid/parsing/grid-template-shorthand-composition.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[grid-template-shorthand-composition.html]
-  [grid-template-rows: auto, grid-template-columns: auto, and "grid-template-areas: "a a a" "b b b";" should be valid.]
-    expected: FAIL
-
-  [grid-template-rows: min-content, grid-template-columns: min-content, and "grid-template-areas: "a a a" "b b b" "c c c" "d d d";" should be valid.]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-masonry/tentative/parsing/masonry-fill-computed.html.ini b/tests/wpt/meta/css/css-masonry/tentative/parsing/masonry-fill-computed.html.ini
new file mode 100644
index 00000000000..24760c67f2b
--- /dev/null
+++ b/tests/wpt/meta/css/css-masonry/tentative/parsing/masonry-fill-computed.html.ini
@@ -0,0 +1,6 @@
+[masonry-fill-computed.html]
+  [Property masonry-fill value 'normal']
+    expected: FAIL
+
+  [Property masonry-fill value 'reverse']
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-masonry/tentative/parsing/masonry-fill-valid.html.ini b/tests/wpt/meta/css/css-masonry/tentative/parsing/masonry-fill-valid.html.ini
new file mode 100644
index 00000000000..ebf12a5ae17
--- /dev/null
+++ b/tests/wpt/meta/css/css-masonry/tentative/parsing/masonry-fill-valid.html.ini
@@ -0,0 +1,6 @@
+[masonry-fill-valid.html]
+  [e.style['masonry-fill'\] = "normal" should set the property value]
+    expected: FAIL
+
+  [e.style['masonry-fill'\] = "reverse" should set the property value]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-cascade-010.html.ini b/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-cascade-010.html.ini
new file mode 100644
index 00000000000..7f26fee392f
--- /dev/null
+++ b/tests/wpt/meta/css/css-pseudo/highlight-cascade/highlight-cascade-010.html.ini
@@ -0,0 +1,3 @@
+[highlight-cascade-010.html]
+  [the custom property receives its initial value from a deferred registration]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/block-height-1.html.ini b/tests/wpt/meta/css/css-sizing/stretch/block-height-001.html.ini
similarity index 94%
rename from tests/wpt/meta/css/css-sizing/stretch/block-height-1.html.ini
rename to tests/wpt/meta/css/css-sizing/stretch/block-height-001.html.ini
index 51f953f5c6a..6d625d3ca9a 100644
--- a/tests/wpt/meta/css/css-sizing/stretch/block-height-1.html.ini
+++ b/tests/wpt/meta/css/css-sizing/stretch/block-height-001.html.ini
@@ -1,4 +1,4 @@
-[block-height-1.html]
+[block-height-001.html]
   [[data-expected-height\] 1]
     expected: FAIL
 
diff --git a/tests/wpt/meta/css/css-sizing/stretch/block-height-002.tentative.html.ini b/tests/wpt/meta/css/css-sizing/stretch/block-height-002.tentative.html.ini
new file mode 100644
index 00000000000..d7815e5e305
--- /dev/null
+++ b/tests/wpt/meta/css/css-sizing/stretch/block-height-002.tentative.html.ini
@@ -0,0 +1,6 @@
+[block-height-002.tentative.html]
+  [main > div > div 1]
+    expected: FAIL
+
+  [main > div > div 2]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/block-height-003.tentative.html.ini b/tests/wpt/meta/css/css-sizing/stretch/block-height-003.tentative.html.ini
new file mode 100644
index 00000000000..d24bc90d29a
--- /dev/null
+++ b/tests/wpt/meta/css/css-sizing/stretch/block-height-003.tentative.html.ini
@@ -0,0 +1,2 @@
+[block-height-003.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/block-height-004.tentative.html.ini b/tests/wpt/meta/css/css-sizing/stretch/block-height-004.tentative.html.ini
new file mode 100644
index 00000000000..965f6004757
--- /dev/null
+++ b/tests/wpt/meta/css/css-sizing/stretch/block-height-004.tentative.html.ini
@@ -0,0 +1,18 @@
+[block-height-004.tentative.html]
+  [.inner 1]
+    expected: FAIL
+
+  [.inner 2]
+    expected: FAIL
+
+  [.inner 3]
+    expected: FAIL
+
+  [.inner 4]
+    expected: FAIL
+
+  [.inner 5]
+    expected: FAIL
+
+  [.inner 6]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/block-height-005.tentative.html.ini b/tests/wpt/meta/css/css-sizing/stretch/block-height-005.tentative.html.ini
new file mode 100644
index 00000000000..b539be8122e
--- /dev/null
+++ b/tests/wpt/meta/css/css-sizing/stretch/block-height-005.tentative.html.ini
@@ -0,0 +1,12 @@
+[block-height-005.tentative.html]
+  [.float + div 1]
+    expected: FAIL
+
+  [.float + div 2]
+    expected: FAIL
+
+  [.float + div 3]
+    expected: FAIL
+
+  [.float + div 4]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/block-height-006.tentative.html.ini b/tests/wpt/meta/css/css-sizing/stretch/block-height-006.tentative.html.ini
new file mode 100644
index 00000000000..7ffdcf18648
--- /dev/null
+++ b/tests/wpt/meta/css/css-sizing/stretch/block-height-006.tentative.html.ini
@@ -0,0 +1,2 @@
+[block-height-006.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/block-height-2.html.ini b/tests/wpt/meta/css/css-sizing/stretch/block-height-2.html.ini
deleted file mode 100644
index 9b6449c79e3..00000000000
--- a/tests/wpt/meta/css/css-sizing/stretch/block-height-2.html.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[block-height-2.html]
-  [[data-expected-height\] 1]
-    expected: FAIL
-
-  [[data-expected-height\] 2]
-    expected: FAIL
diff --git a/tests/wpt/meta/css/css-sizing/stretch/content-contribution-001.html.ini b/tests/wpt/meta/css/css-sizing/stretch/content-contribution-001.html.ini
new file mode 100644
index 00000000000..31311943629
--- /dev/null
+++ b/tests/wpt/meta/css/css-sizing/stretch/content-contribution-001.html.ini
@@ -0,0 +1,9 @@
+[content-contribution-001.html]
+  [.test 1]
+    expected: FAIL
+
+  [.test 2]
+    expected: FAIL
+
+  [.test 5]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/css-values/vh_not_refreshing_on_chrome.html.ini b/tests/wpt/meta/css/css-values/vh_not_refreshing_on_chrome.html.ini
new file mode 100644
index 00000000000..61c7e8e9d50
--- /dev/null
+++ b/tests/wpt/meta/css/css-values/vh_not_refreshing_on_chrome.html.ini
@@ -0,0 +1,2 @@
+[vh_not_refreshing_on_chrome.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini b/tests/wpt/meta/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini
index 037d7e0f951..c124d4bb540 100644
--- a/tests/wpt/meta/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini
+++ b/tests/wpt/meta/css/cssom-view/MediaQueryList-addListener-handleEvent.html.ini
@@ -4,3 +4,12 @@
 
   [throws if handleEvent is thruthy and not callable]
     expected: FAIL
+
+  [looks up handleEvent method on every event dispatch]
+    expected: FAIL
+
+  [doesn't look up handleEvent method on callable event listeners]
+    expected: FAIL
+
+  [rethrows errors when getting handleEvent]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini b/tests/wpt/meta/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
index 539671d4394..7e55b5e346e 100644
--- a/tests/wpt/meta/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
+++ b/tests/wpt/meta/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
@@ -1,22 +1,18 @@
 [MediaQueryList-addListener-removeListener.html]
-  expected: TIMEOUT
   [listeners are called when <iframe> is resized]
     expected: FAIL
 
   [listeners are called correct number of times]
-    expected: TIMEOUT
+    expected: FAIL
 
   [listeners are called in order they were added]
-    expected: NOTRUN
+    expected: FAIL
 
   [listener that was added twice is called only once]
-    expected: NOTRUN
+    expected: FAIL
 
   [listeners are called in order their MQLs were created]
-    expected: NOTRUN
+    expected: FAIL
 
   [removing listener from one MQL doesn't remove it from all MQLs]
-    expected: NOTRUN
-
-  [MediaQueryList::removeListener removes added listener]
-    expected: NOTRUN
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/MediaQueryList-extends-EventTarget-interop.html.ini b/tests/wpt/meta/css/cssom-view/MediaQueryList-extends-EventTarget-interop.html.ini
new file mode 100644
index 00000000000..b5218650b98
--- /dev/null
+++ b/tests/wpt/meta/css/cssom-view/MediaQueryList-extends-EventTarget-interop.html.ini
@@ -0,0 +1,12 @@
+[MediaQueryList-extends-EventTarget-interop.html]
+  [listener added with addListener and addEventListener (capture) is called twice]
+    expected: FAIL
+
+  [removeEventListener (capture) doesn't remove listener added with addListener]
+    expected: FAIL
+
+  [removeListener doesn't remove listener added with addEventListener (capture)]
+    expected: FAIL
+
+  [capturing event listener fires before non-capturing listener at target]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/MediaQueryList-extends-EventTarget.html.ini b/tests/wpt/meta/css/cssom-view/MediaQueryList-extends-EventTarget.html.ini
new file mode 100644
index 00000000000..bfd64f1c58d
--- /dev/null
+++ b/tests/wpt/meta/css/cssom-view/MediaQueryList-extends-EventTarget.html.ini
@@ -0,0 +1,9 @@
+[MediaQueryList-extends-EventTarget.html]
+  [onchange removes listener]
+    expected: FAIL
+
+  [listeners for "change" type are called]
+    expected: FAIL
+
+  [addEventListener "once" option is respected]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/MediaQueryListEvent.html.ini b/tests/wpt/meta/css/cssom-view/MediaQueryListEvent.html.ini
new file mode 100644
index 00000000000..2bff632780a
--- /dev/null
+++ b/tests/wpt/meta/css/cssom-view/MediaQueryListEvent.html.ini
@@ -0,0 +1,6 @@
+[MediaQueryListEvent.html]
+  [argument of onchange]
+    expected: FAIL
+
+  [constructor of "change" event]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/scrollWidthHeight-negative-margin-002.html.ini b/tests/wpt/meta/css/cssom-view/scrollWidthHeight-negative-margin-002.html.ini
index b283b02b908..32bf625cd2d 100644
--- a/tests/wpt/meta/css/cssom-view/scrollWidthHeight-negative-margin-002.html.ini
+++ b/tests/wpt/meta/css/cssom-view/scrollWidthHeight-negative-margin-002.html.ini
@@ -503,3 +503,51 @@
 
   [scrollHeight with negative margins: display: flex; overflow: scroll; direction: rtl; flex-flow: column-reverse wrap-reverse;]
     expected: FAIL
+
+  [scrollWidth with negative margins: display: flow-root; overflow: visible; direction: ltr; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: flow-root; overflow: visible; direction: ltr; flex-direction: row;]
+    expected: FAIL
+
+  [scrollWidth with negative margins: display: flow-root; overflow: hidden; direction: ltr; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: flow-root; overflow: hidden; direction: ltr; flex-direction: row;]
+    expected: FAIL
+
+  [scrollWidth with negative margins: display: flow-root; overflow: auto; direction: ltr; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: flow-root; overflow: auto; direction: ltr; flex-direction: row;]
+    expected: FAIL
+
+  [scrollWidth with negative margins: display: flow-root; overflow: scroll; direction: ltr; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: flow-root; overflow: scroll; direction: ltr; flex-direction: row;]
+    expected: FAIL
+
+  [scrollWidth with negative margins: display: flow-root; overflow: visible; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: flow-root; overflow: visible; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollWidth with negative margins: display: flow-root; overflow: hidden; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: flow-root; overflow: hidden; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollWidth with negative margins: display: flow-root; overflow: auto; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: flow-root; overflow: auto; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollWidth with negative margins: display: flow-root; overflow: scroll; direction: rtl; flex-direction: row;]
+    expected: FAIL
+
+  [scrollHeight with negative margins: display: flow-root; overflow: scroll; direction: rtl; flex-direction: row;]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht.ini b/tests/wpt/meta/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht.ini
index 90fe9e3649e..df162554252 100644
--- a/tests/wpt/meta/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht.ini
+++ b/tests/wpt/meta/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht.ini
@@ -4,3 +4,6 @@
 
   [elemOverflow.scrollHeight is the width of its scrolled contents (plus padding)]
     expected: FAIL
+
+  [elemOverflow.scrollHeight is the height of its scrolled contents (plus padding, since we overflowed)]
+    expected: FAIL
diff --git a/tests/wpt/meta/css/cssom/serialize-values.html.ini b/tests/wpt/meta/css/cssom/serialize-values.html.ini
index aedbbe5bea6..50f7ad9eee5 100644
--- a/tests/wpt/meta/css/cssom/serialize-values.html.ini
+++ b/tests/wpt/meta/css/cssom/serialize-values.html.ini
@@ -82,3 +82,6 @@
 
   [list-style-type: lower-roman]
     expected: FAIL
+
+  [content: attr(foo, "")]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-importNode.tentative.html.ini b/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-importNode.tentative.html.ini
new file mode 100644
index 00000000000..f4010b0a634
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-importNode.tentative.html.ini
@@ -0,0 +1,9 @@
+[ShadowRoot-importNode.tentative.html]
+  [ShadowRoot.importNode: an upgrade candidate from document]
+    expected: FAIL
+
+  [ShadowRoot.importNode: a custom element from another shadow tree]
+    expected: FAIL
+
+  [ShadowRoot.importNode: a template content from document]
+    expected: FAIL
diff --git a/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-innerHTML.tentative.html.ini b/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-innerHTML.tentative.html.ini
new file mode 100644
index 00000000000..5da135699ed
--- /dev/null
+++ b/tests/wpt/meta/custom-elements/scoped-registry/ShadowRoot-innerHTML.tentative.html.ini
@@ -0,0 +1,15 @@
+[ShadowRoot-innerHTML.tentative.html]
+  [innerHTML on a shadow root should use scoped custom element registry]
+    expected: FAIL
+
+  [innerHTML on a disconnected element should use the associated scoped custom element registry]
+    expected: FAIL
+
+  [innerHTML on a connected shadow root should use its scoped custom element]
+    expected: FAIL
+
+  [innerHTML on an inserted element should use the scoped custom element of the ancestor shadow root]
+    expected: FAIL
+
+  [innerHTML should not upgrade a custom element inside a template element]
+    expected: FAIL
diff --git a/tests/wpt/meta/dom/nodes/moveBefore/tentative/Node-moveBefore.html.ini b/tests/wpt/meta/dom/nodes/moveBefore/tentative/Node-moveBefore.html.ini
index b05b39d77ea..5abd05c160d 100644
--- a/tests/wpt/meta/dom/nodes/moveBefore/tentative/Node-moveBefore.html.ini
+++ b/tests/wpt/meta/dom/nodes/moveBefore/tentative/Node-moveBefore.html.ini
@@ -142,3 +142,15 @@
 
   [No custom element callbacks are run during disconnected moveBefore()]
     expected: FAIL
+
+  [moveBefore() CharacterData into a Document]
+    expected: FAIL
+
+  [Moving a node from a disconnected container to a disconnected new parent without a shared ancestor throws a HIERARCHY_REQUEST_ERR]
+    expected: FAIL
+
+  [Moving a node from a disconnected container to a disconnected new parent in the same tree succeeds]
+    expected: FAIL
+
+  [Moving a node from a disconnected container to a disconnected new parent in the same tree succeeds,also across shadow-roots]
+    expected: FAIL
diff --git a/tests/wpt/meta/dom/observable/tentative/observable-reduce.any.js.ini b/tests/wpt/meta/dom/observable/tentative/observable-reduce.any.js.ini
index 4cde98f9a0d..2bbeebe8038 100644
--- a/tests/wpt/meta/dom/observable/tentative/observable-reduce.any.js.ini
+++ b/tests/wpt/meta/dom/observable/tentative/observable-reduce.any.js.ini
@@ -20,6 +20,9 @@
   [reduce(): Reject with an AbortError if the subscription is aborted before the source completes]
     expected: FAIL
 
+  [reduce(): Reduces the values for different objects]
+    expected: FAIL
+
 
 [observable-reduce.any.worker.html]
   [reduce(): Reduces the values of the Observable, starting with the initial seed value]
@@ -42,3 +45,6 @@
 
   [reduce(): Reject with an AbortError if the subscription is aborted before the source completes]
     expected: FAIL
+
+  [reduce(): Reduces the values for different objects]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/css-font-face.https.sub.tentative.html.ini b/tests/wpt/meta/fetch/metadata/generated/css-font-face.https.sub.tentative.html.ini
index 4dcac5c96b4..c7e0d7d20e9 100644
--- a/tests/wpt/meta/fetch/metadata/generated/css-font-face.https.sub.tentative.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/css-font-face.https.sub.tentative.html.ini
@@ -49,3 +49,6 @@
 
   [sec-fetch-dest]
     expected: FAIL
+
+  [sec-fetch-storage-access - Same site]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/css-font-face.sub.tentative.html.ini b/tests/wpt/meta/fetch/metadata/generated/css-font-face.sub.tentative.html.ini
index d557a3a8ee6..d55596a6a0d 100644
--- a/tests/wpt/meta/fetch/metadata/generated/css-font-face.sub.tentative.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/css-font-face.sub.tentative.html.ini
@@ -43,3 +43,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade]
     expected: [FAIL, PASS]
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: FAIL
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: FAIL
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/css-images.https.sub.tentative.html.ini b/tests/wpt/meta/fetch/metadata/generated/css-images.https.sub.tentative.html.ini
index a1ab6094831..9915a83e9ab 100644
--- a/tests/wpt/meta/fetch/metadata/generated/css-images.https.sub.tentative.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/css-images.https.sub.tentative.html.ini
@@ -266,3 +266,30 @@
 
   [border-image sec-fetch-user]
     expected: FAIL
+
+  [background-image sec-fetch-storage-access - Cross-site]
+    expected: TIMEOUT
+
+  [border-image sec-fetch-storage-access - Cross-site]
+    expected: FAIL
+
+  [content sec-fetch-storage-access - Cross-site]
+    expected: FAIL
+
+  [cursor sec-fetch-storage-access - Cross-site]
+    expected: FAIL
+
+  [list-style-image sec-fetch-storage-access - Cross-site]
+    expected: FAIL
+
+  [border-image sec-fetch-storage-access - Same site]
+    expected: FAIL
+
+  [content sec-fetch-storage-access - Same site]
+    expected: FAIL
+
+  [cursor sec-fetch-storage-access - Same site]
+    expected: FAIL
+
+  [list-style-image sec-fetch-storage-access - Same site]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/css-images.sub.tentative.html.ini b/tests/wpt/meta/fetch/metadata/generated/css-images.sub.tentative.html.ini
index 7b4cf2c5ae7..dffd09f7ad0 100644
--- a/tests/wpt/meta/fetch/metadata/generated/css-images.sub.tentative.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/css-images.sub.tentative.html.ini
@@ -188,3 +188,39 @@
 
   [background-image sec-fetch-site - HTTPS downgrade (header not sent)]
     expected: TIMEOUT
+
+  [border-image sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: FAIL
+
+  [content sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: FAIL
+
+  [cursor sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: FAIL
+
+  [list-style-image sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: FAIL
+
+  [border-image sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: FAIL
+
+  [content sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: FAIL
+
+  [cursor sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: FAIL
+
+  [list-style-image sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: FAIL
+
+  [border-image sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: FAIL
+
+  [content sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: FAIL
+
+  [cursor sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: FAIL
+
+  [list-style-image sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-area.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-area.sub.html.ini
index a82f7428f6a..171d4b1e282 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-area.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-area.sub.html.ini
@@ -44,3 +44,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade - no attributes]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - no attributes]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-audio.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-audio.https.sub.html.ini
index 03e98a8db48..5ccc5d709f8 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-audio.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-audio.https.sub.html.ini
@@ -22,3 +22,6 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade, no attributes]
     expected: FAIL
+
+  [sec-fetch-storage-access - Cross-site, no attributes]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-embed.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-embed.https.sub.html.ini
index a61ffa1463c..7018dd4d39b 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-embed.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-embed.https.sub.html.ini
@@ -50,3 +50,9 @@
 
   [sec-fetch-user]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-embed.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-embed.sub.html.ini
index 1afa0345596..a0b0278dbd5 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-embed.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-embed.sub.html.ini
@@ -44,3 +44,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-frame.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-frame.sub.html.ini
index 94bf6c786c3..135cef9edf4 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-frame.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-frame.sub.html.ini
@@ -44,3 +44,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-img-environment-change.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-img-environment-change.https.sub.html.ini
index 72acbca145f..e1b5107c93c 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-img-environment-change.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-img-environment-change.https.sub.html.ini
@@ -1,61 +1,61 @@
 [element-img-environment-change.https.sub.html]
   expected: TIMEOUT
   [sec-fetch-site - Cross-site, no attributes]
-    expected: TIMEOUT
+    expected: FAIL
 
   [sec-fetch-site - Same site, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Cross-Site -> Same-Origin redirect, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Same-Site -> Same-Origin redirect, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Cross-Site -> Same Origin, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Cross-Site -> Same-Site, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Cross-Site -> Cross-Site, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Same Origin, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Same-Site, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Origin -> Cross-Site, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Site -> Same Origin, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Site -> Same-Site, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same-Site -> Cross-Site, no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-mode - no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-mode - attributes: crossorigin]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-mode - attributes: crossorigin=anonymous]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-mode - attributes: crossorigin=use-credentials]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-dest - no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-user - no attributes]
-    expected: NOTRUN
+    expected: FAIL
 
   [sec-fetch-site - Same origin, no attributes]
     expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-img-environment-change.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-img-environment-change.sub.html.ini
index 410ec4c1d39..5e6dca448af 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-img-environment-change.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-img-environment-change.sub.html.ini
@@ -1,7 +1,7 @@
 [element-img-environment-change.sub.html]
   expected: TIMEOUT
   [sec-fetch-site - Not sent to non-trustworthy same-site destination, no attributes]
-    expected: TIMEOUT
+    expected: FAIL
 
   [sec-fetch-site - Not sent to non-trustworthy cross-site destination, no attributes]
     expected: NOTRUN
@@ -41,3 +41,6 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade, no attributes]
     expected: NOTRUN
+
+  [sec-fetch-site - Not sent to non-trustworthy same-origin destination, no attributes]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-img.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-img.https.sub.html.ini
index a42697b3dc8..a0fe191d526 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-img.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-img.https.sub.html.ini
@@ -43,3 +43,9 @@
 
   [sec-fetch-site - src - HTTPS downgrade-upgrade, no attributes]
     expected: FAIL
+
+  [sec-fetch-storage-access - src - Cross-site, no attributes]
+    expected: FAIL
+
+  [sec-fetch-storage-access - srcset - Cross-site, no attributes]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-input-image.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-input-image.https.sub.html.ini
index f749f3403a6..b9b58f62c92 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-input-image.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-input-image.https.sub.html.ini
@@ -53,3 +53,9 @@
 
   [sec-fetch-user - no attributes]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site, no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site, no attributes]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-input-image.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-input-image.sub.html.ini
index 59c416c96c0..4141f644642 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-input-image.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-input-image.sub.html.ini
@@ -44,3 +44,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade, no attributes]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination, no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination, no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination, no attributes]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-link-icon.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-link-icon.https.sub.html.ini
index 1497c8d2770..413df63e004 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-link-icon.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-link-icon.https.sub.html.ini
@@ -59,3 +59,9 @@
 
   [sec-fetch-user no attributes]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site no attributes]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-link-icon.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-link-icon.sub.html.ini
index e2e601ee012..da5d7731a74 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-link-icon.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-link-icon.sub.html.ini
@@ -44,3 +44,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade no attributes]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination no attributes]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-link-prefetch.https.optional.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-link-prefetch.https.optional.sub.html.ini
index a1d357e629e..ccb5ced4fc0 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-link-prefetch.https.optional.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-link-prefetch.https.optional.sub.html.ini
@@ -61,3 +61,6 @@
 
   [sec-fetch-dest attributes: as=worker]
     expected: FAIL
+
+  [sec-fetch-storage-access - Cross-site no attributes]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-picture.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-picture.https.sub.html.ini
index b6973de9897..ea347e106eb 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-picture.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-picture.https.sub.html.ini
@@ -61,3 +61,12 @@
 
   [sec-fetch-site - source[srcset\] - Same-Site -> Cross-Site, no attributes]
     expected: FAIL
+
+  [sec-fetch-storage-access - img[src\] - Cross-site, no attributes]
+    expected: FAIL
+
+  [sec-fetch-storage-access - img[srcset\] - Cross-site, no attributes]
+    expected: FAIL
+
+  [sec-fetch-storage-access - source[srcset\] - Cross-site, no attributes]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-script.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-script.https.sub.html.ini
index 217a1c62e79..1d1e07b42e1 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-script.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-script.https.sub.html.ini
@@ -40,3 +40,6 @@
 
   [sec-fetch-site - Same-Site -> Cross-Site, attributes: type=module]
     expected: FAIL
+
+  [sec-fetch-storage-access - Cross-site, no attributes]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-video-poster.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-video-poster.https.sub.html.ini
index 8a8a1dcb679..dc51438cbf9 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-video-poster.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-video-poster.https.sub.html.ini
@@ -53,3 +53,9 @@
 
   [sec-fetch-user]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-video-poster.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-video-poster.sub.html.ini
index d711f12d397..689ce52960e 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-video-poster.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-video-poster.sub.html.ini
@@ -44,3 +44,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/element-video.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/element-video.https.sub.html.ini
index 2978eb8f94f..95d4ed00243 100644
--- a/tests/wpt/meta/fetch/metadata/generated/element-video.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/element-video.https.sub.html.ini
@@ -22,3 +22,6 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade, no attributes]
     expected: FAIL
+
+  [sec-fetch-storage-access - Cross-site, no attributes]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/fetch-via-serviceworker.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/fetch-via-serviceworker.https.sub.html.ini
index 35a5acda9c7..bf61a3677b7 100644
--- a/tests/wpt/meta/fetch/metadata/generated/fetch-via-serviceworker.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/fetch-via-serviceworker.https.sub.html.ini
@@ -118,3 +118,15 @@
 
   [sec-fetch-user - no init - fallback]
     expected: FAIL
+
+  [sec-fetch-storage-access - Cross-site, init: mode=no-cors, credentials=include - respondWith]
+    expected: FAIL
+
+  [sec-fetch-storage-access - Cross-site, init: mode=no-cors, credentials=include - fallback]
+    expected: FAIL
+
+  [sec-fetch-storage-access - Same site, init: mode=no-cors, credentials=include - respondWith]
+    expected: FAIL
+
+  [sec-fetch-storage-access - Same site, init: mode=no-cors, credentials=include - fallback]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/fetch.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/fetch.https.sub.html.ini
index 6153b15aec8..7b9d1002ec9 100644
--- a/tests/wpt/meta/fetch/metadata/generated/fetch.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/fetch.https.sub.html.ini
@@ -19,3 +19,6 @@
 
   [sec-fetch-site - Same-Site -> Cross-Site, init: mode=no-cors]
     expected: FAIL
+
+  [sec-fetch-storage-access - Cross-site, init: mode=no-cors, credentials=include]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/form-submission.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/form-submission.sub.html.ini
index 4841ed06a03..b7215d66629 100644
--- a/tests/wpt/meta/fetch/metadata/generated/form-submission.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/form-submission.sub.html.ini
@@ -89,3 +89,21 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade - POST]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - GET]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - POST]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - GET]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - POST]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - GET]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - POST]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/header-link.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/header-link.https.sub.html.ini
index 6346c6dbf6c..757e542f956 100644
--- a/tests/wpt/meta/fetch/metadata/generated/header-link.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/header-link.https.sub.html.ini
@@ -97,3 +97,15 @@
 
   [sec-fetch-user rel=stylesheet]
     expected: FAIL
+
+  [sec-fetch-storage-access rel=icon - Cross-site]
+    expected: FAIL
+
+  [sec-fetch-storage-access rel=stylesheet - Cross-site]
+    expected: FAIL
+
+  [sec-fetch-storage-access rel=icon - Same site]
+    expected: FAIL
+
+  [sec-fetch-storage-access rel=stylesheet - Same site]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/header-link.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/header-link.sub.html.ini
index cb3931b0d7a..9da74977965 100644
--- a/tests/wpt/meta/fetch/metadata/generated/header-link.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/header-link.sub.html.ini
@@ -88,3 +88,21 @@
 
   [sec-fetch-site rel=stylesheet - HTTPS downgrade-upgrade]
     expected: FAIL
+
+  [sec-fetch-storage-access rel=icon - Not sent to non-trustworthy same-origin destination]
+    expected: FAIL
+
+  [sec-fetch-storage-access rel=stylesheet - Not sent to non-trustworthy same-origin destination]
+    expected: FAIL
+
+  [sec-fetch-storage-access rel=icon - Not sent to non-trustworthy same-site destination]
+    expected: FAIL
+
+  [sec-fetch-storage-access rel=stylesheet - Not sent to non-trustworthy same-site destination]
+    expected: FAIL
+
+  [sec-fetch-storage-access rel=icon - Not sent to non-trustworthy cross-site destination]
+    expected: FAIL
+
+  [sec-fetch-storage-access rel=stylesheet - Not sent to non-trustworthy cross-site destination]
+    expected: FAIL
diff --git a/tests/wpt/meta/fetch/metadata/generated/header-refresh.https.optional.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/header-refresh.https.optional.sub.html.ini
index 1977a28c32b..b4aa17447bc 100644
--- a/tests/wpt/meta/fetch/metadata/generated/header-refresh.https.optional.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/header-refresh.https.optional.sub.html.ini
@@ -53,3 +53,9 @@
 
   [sec-fetch-user]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/header-refresh.optional.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/header-refresh.optional.sub.html.ini
index 33ce93d57e8..deb8331cdf8 100644
--- a/tests/wpt/meta/fetch/metadata/generated/header-refresh.optional.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/header-refresh.optional.sub.html.ini
@@ -44,3 +44,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/svg-image.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/svg-image.https.sub.html.ini
index fc5f1de1d19..5d85add7f82 100644
--- a/tests/wpt/meta/fetch/metadata/generated/svg-image.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/svg-image.https.sub.html.ini
@@ -62,3 +62,9 @@
 
   [sec-fetch-user no attributes]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site no attributes]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/svg-image.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/svg-image.sub.html.ini
index c563b49ee04..dc3a74db79c 100644
--- a/tests/wpt/meta/fetch/metadata/generated/svg-image.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/svg-image.sub.html.ini
@@ -44,3 +44,12 @@
 
   [sec-fetch-site - HTTPS downgrade-upgrade no attributes]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination no attributes]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination no attributes]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/window-history.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/window-history.https.sub.html.ini
index 40416da6081..c92712ae95b 100644
--- a/tests/wpt/meta/fetch/metadata/generated/window-history.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/window-history.https.sub.html.ini
@@ -35,3 +35,15 @@
 
   [sec-fetch-user - history.forward]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site - history.back]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Cross-site - history.forward]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site - history.back]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Same site - history.forward]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/window-history.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/window-history.sub.html.ini
index 9752bedb009..24992408164 100644
--- a/tests/wpt/meta/fetch/metadata/generated/window-history.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/window-history.sub.html.ini
@@ -71,3 +71,21 @@
 
   [sec-fetch-user - Not sent to non-trustworthy cross-site destination - history.forward]
     expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - history.back]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - history.forward]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - history.back]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - history.forward]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - history.back]
+    expected: NOTRUN
+
+  [sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - history.forward]
+    expected: NOTRUN
diff --git a/tests/wpt/meta/fetch/metadata/generated/worker-dedicated-importscripts.https.sub.html.ini b/tests/wpt/meta/fetch/metadata/generated/worker-dedicated-importscripts.https.sub.html.ini
index c4c3f669fe2..c1e2dd8e89c 100644
--- a/tests/wpt/meta/fetch/metadata/generated/worker-dedicated-importscripts.https.sub.html.ini
+++ b/tests/wpt/meta/fetch/metadata/generated/worker-dedicated-importscripts.https.sub.html.ini
@@ -19,3 +19,6 @@
 
   [sec-fetch-site - Same-Site -> Cross-Site]
     expected: FAIL
+
+  [sec-fetch-storage-access - Cross-site]
+    expected: FAIL
diff --git a/tests/wpt/meta/fullscreen/crashtests/chrome-1312699.html.ini b/tests/wpt/meta/fullscreen/crashtests/chrome-1312699.html.ini
new file mode 100644
index 00000000000..f1efc6d3c4c
--- /dev/null
+++ b/tests/wpt/meta/fullscreen/crashtests/chrome-1312699.html.ini
@@ -0,0 +1,2 @@
+[chrome-1312699.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/fullscreen/crashtests/content-visibility-crash.html.ini b/tests/wpt/meta/fullscreen/crashtests/content-visibility-crash.html.ini
new file mode 100644
index 00000000000..03718ff93c2
--- /dev/null
+++ b/tests/wpt/meta/fullscreen/crashtests/content-visibility-crash.html.ini
@@ -0,0 +1,2 @@
+[content-visibility-crash.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/fullscreen/rendering/backdrop-iframe.html.ini b/tests/wpt/meta/fullscreen/rendering/backdrop-iframe.html.ini
new file mode 100644
index 00000000000..70d926570da
--- /dev/null
+++ b/tests/wpt/meta/fullscreen/rendering/backdrop-iframe.html.ini
@@ -0,0 +1,2 @@
+[backdrop-iframe.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/fullscreen/rendering/backdrop-inherit.html.ini b/tests/wpt/meta/fullscreen/rendering/backdrop-inherit.html.ini
new file mode 100644
index 00000000000..9de3b56d1e9
--- /dev/null
+++ b/tests/wpt/meta/fullscreen/rendering/backdrop-inherit.html.ini
@@ -0,0 +1,2 @@
+[backdrop-inherit.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/fullscreen/rendering/backdrop-object.html.ini b/tests/wpt/meta/fullscreen/rendering/backdrop-object.html.ini
new file mode 100644
index 00000000000..46e7b6f55cd
--- /dev/null
+++ b/tests/wpt/meta/fullscreen/rendering/backdrop-object.html.ini
@@ -0,0 +1,2 @@
+[backdrop-object.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/fullscreen/rendering/fullscreen-root-fills-page.html.ini b/tests/wpt/meta/fullscreen/rendering/fullscreen-root-fills-page.html.ini
new file mode 100644
index 00000000000..cf9995f8551
--- /dev/null
+++ b/tests/wpt/meta/fullscreen/rendering/fullscreen-root-fills-page.html.ini
@@ -0,0 +1,2 @@
+[fullscreen-root-fills-page.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1.html.ini b/tests/wpt/meta/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1.html.ini
new file mode 100644
index 00000000000..443ba6bad27
--- /dev/null
+++ b/tests/wpt/meta/html/browsers/history/the-history-interface/traverse_the_history_write_onload_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_write_onload_1.html]
+  expected: TIMEOUT
+  [Traverse the history when a history entry is written in the load event]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/html/browsers/windows/auxiliary-browsing-contexts/named-lookup-scoped-to-browsing-context-group.html.ini b/tests/wpt/meta/html/browsers/windows/auxiliary-browsing-contexts/named-lookup-scoped-to-browsing-context-group.html.ini
new file mode 100644
index 00000000000..d5ad70e64c8
--- /dev/null
+++ b/tests/wpt/meta/html/browsers/windows/auxiliary-browsing-contexts/named-lookup-scoped-to-browsing-context-group.html.ini
@@ -0,0 +1,3 @@
+[named-lookup-scoped-to-browsing-context-group.html]
+  [named lookup scoped to browsing context group]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/browsers/windows/auxiliary-browsing-contexts/no-proactive-swap-when-other-contexts-in-group.html.ini b/tests/wpt/meta/html/browsers/windows/auxiliary-browsing-contexts/no-proactive-swap-when-other-contexts-in-group.html.ini
new file mode 100644
index 00000000000..80e8c54e643
--- /dev/null
+++ b/tests/wpt/meta/html/browsers/windows/auxiliary-browsing-contexts/no-proactive-swap-when-other-contexts-in-group.html.ini
@@ -0,0 +1,3 @@
+[no-proactive-swap-when-other-contexts-in-group.html]
+  [no proactive browsing context group change when other contexts in group]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-transfer.html.ini b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-transfer.html.ini
index 7e036a1c4e4..5d2657041d1 100644
--- a/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-transfer.html.ini
+++ b/tests/wpt/meta/html/canvas/element/manual/imagebitmap/createImageBitmap-transfer.html.ini
@@ -1,5 +1,5 @@
 [createImageBitmap-transfer.html]
-  expected: TIMEOUT
+  expected: ERROR
   [Transfer ImageBitmap created from a vector HTMLImageElement]
     expected: FAIL
 
diff --git a/tests/wpt/meta/html/canvas/element/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini b/tests/wpt/meta/html/canvas/element/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
deleted file mode 100644
index 751ca58fa7e..00000000000
--- a/tests/wpt/meta/html/canvas/element/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.text.measure.caret-position-edge-cases.tentative.html]
-  [Test the edge cases for caretPositionFromPoint, where the point is at the edge of glyph and at the midpoint.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/text/2d.text.measure.caret-position-edges.tentative.html.ini b/tests/wpt/meta/html/canvas/element/text/2d.text.measure.caret-position-edges.tentative.html.ini
deleted file mode 100644
index a8f84833ae9..00000000000
--- a/tests/wpt/meta/html/canvas/element/text/2d.text.measure.caret-position-edges.tentative.html.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-[2d.text.measure.caret-position-edges.tentative.html]
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align left.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align left.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align center.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align center.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align right.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align right.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align start.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align start.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align end.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align end.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/text/2d.text.measure.caret-position.tentative.html.ini b/tests/wpt/meta/html/canvas/element/text/2d.text.measure.caret-position.tentative.html.ini
deleted file mode 100644
index 2b7dea3b3b2..00000000000
--- a/tests/wpt/meta/html/canvas/element/text/2d.text.measure.caret-position.tentative.html.ini
+++ /dev/null
@@ -1,120 +0,0 @@
-[2d.text.measure.caret-position.tentative.html]
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and directional-override.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/text/2d.text.measure.index-from-offset-edge-cases.tentative.html.ini b/tests/wpt/meta/html/canvas/element/text/2d.text.measure.index-from-offset-edge-cases.tentative.html.ini
new file mode 100644
index 00000000000..3fb0ac9858e
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/text/2d.text.measure.index-from-offset-edge-cases.tentative.html.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.index-from-offset-edge-cases.tentative.html]
+  [Test the edge cases for getIndexFromOffset, where the point is at the edge of glyph and at the midpoint.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/text/2d.text.measure.index-from-offset-edges.tentative.html.ini b/tests/wpt/meta/html/canvas/element/text/2d.text.measure.index-from-offset-edges.tentative.html.ini
new file mode 100644
index 00000000000..9fc76a3df0f
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/text/2d.text.measure.index-from-offset-edges.tentative.html.ini
@@ -0,0 +1,30 @@
+[2d.text.measure.index-from-offset-edges.tentative.html]
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align left.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align left.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align center.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align center.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align right.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align right.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align start.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align start.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align end.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align end.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/text/2d.text.measure.index-from-offset.tentative.html.ini b/tests/wpt/meta/html/canvas/element/text/2d.text.measure.index-from-offset.tentative.html.ini
new file mode 100644
index 00000000000..a47670fb697
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/text/2d.text.measure.index-from-offset.tentative.html.ini
@@ -0,0 +1,120 @@
+[2d.text.measure.index-from-offset.tentative.html]
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and directional-override.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/element/text/2d.text.measure.text-clusters-rendering-options.tentative.html.ini b/tests/wpt/meta/html/canvas/element/text/2d.text.measure.text-clusters-rendering-options.tentative.html.ini
new file mode 100644
index 00000000000..41b2bed1c53
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/element/text/2d.text.measure.text-clusters-rendering-options.tentative.html.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.text-clusters-rendering-options.tentative.html]
+  [Test that fillTextCluster() correctly applies the options passed as a dictionary.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
deleted file mode 100644
index 751ca58fa7e..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.text.measure.caret-position-edge-cases.tentative.html]
-  [Test the edge cases for caretPositionFromPoint, where the point is at the edge of glyph and at the midpoint.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.js.ini
deleted file mode 100644
index 5d4cad8801f..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.js.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[2d.text.measure.caret-position-edge-cases.tentative.worker.html]
-  [Test the edge cases for caretPositionFromPoint, where the point is at the edge of glyph and at the midpoint.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.html.ini
deleted file mode 100644
index a8f84833ae9..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.html.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-[2d.text.measure.caret-position-edges.tentative.html]
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align left.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align left.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align center.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align center.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align right.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align right.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align start.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align start.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align end.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align end.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.worker.js.ini
deleted file mode 100644
index 08ebd3f82f7..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.worker.js.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-[2d.text.measure.caret-position-edges.tentative.worker.html]
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align left.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align left.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align center.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align center.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align right.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align right.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align start.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align start.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align end.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align end.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position.tentative.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position.tentative.html.ini
deleted file mode 100644
index 2b7dea3b3b2..00000000000
--- a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.caret-position.tentative.html.ini
+++ /dev/null
@@ -1,120 +0,0 @@
-[2d.text.measure.caret-position.tentative.html]
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and no-directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and directional-override.]
-    expected: FAIL
-
-  [Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and directional-override.]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.html.ini
new file mode 100644
index 00000000000..3fb0ac9858e
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.html.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.index-from-offset-edge-cases.tentative.html]
+  [Test the edge cases for getIndexFromOffset, where the point is at the edge of glyph and at the midpoint.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.worker.js.ini
new file mode 100644
index 00000000000..585f24e16c6
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.index-from-offset-edge-cases.tentative.worker.html]
+  [Test the edge cases for getIndexFromOffset, where the point is at the edge of glyph and at the midpoint.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edges.tentative.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edges.tentative.html.ini
new file mode 100644
index 00000000000..9fc76a3df0f
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edges.tentative.html.ini
@@ -0,0 +1,30 @@
+[2d.text.measure.index-from-offset-edges.tentative.html]
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align left.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align left.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align center.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align center.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align right.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align right.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align start.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align start.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align end.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align end.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edges.tentative.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edges.tentative.worker.js.ini
new file mode 100644
index 00000000000..00783defba3
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edges.tentative.worker.js.ini
@@ -0,0 +1,30 @@
+[2d.text.measure.index-from-offset-edges.tentative.worker.html]
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align left.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align left.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align center.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align center.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align right.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align right.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align start.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align start.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align end.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align end.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset.tentative.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset.tentative.html.ini
new file mode 100644
index 00000000000..a47670fb697
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.index-from-offset.tentative.html.ini
@@ -0,0 +1,120 @@
+[2d.text.measure.index-from-offset.tentative.html]
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and no-directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and directional-override.]
+    expected: FAIL
+
+  [Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and directional-override.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.html.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.html.ini
new file mode 100644
index 00000000000..41b2bed1c53
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.html.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.text-clusters-rendering-options.tentative.html]
+  [Test that fillTextCluster() correctly applies the options passed as a dictionary.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.worker.js.ini b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.worker.js.ini
new file mode 100644
index 00000000000..b5d9ad0762d
--- /dev/null
+++ b/tests/wpt/meta/html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.worker.js.ini
@@ -0,0 +1,3 @@
+[2d.text.measure.text-clusters-rendering-options.tentative.worker.html]
+  [Test that fillTextCluster() correctly applies the options passed as a dictionary.]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-reload-location-reload.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-reload-location-reload.html.ini
deleted file mode 100644
index 247b8ee99a6..00000000000
--- a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe-loading-lazy-reload-location-reload.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[iframe-loading-lazy-reload-location-reload.html]
-  [Reloading iframe loading='lazy' before it is loaded: location.reload]
-    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index 26704422bbe..4b77e7d8e61 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,4 +1,4 @@
 [iframe_sandbox_popups_escaping-2.html]
   expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: TIMEOUT
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
index e8872b3585b..62a6e7fc812 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-1.html.ini
@@ -1,4 +1,4 @@
 [iframe_sandbox_popups_nonescaping-1.html]
-  expected: TIMEOUT
+  expected: CRASH
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
diff --git a/tests/wpt/meta/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini b/tests/wpt/meta/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
index ffffd1d3d75..c16c127391c 100644
--- a/tests/wpt/meta/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
+++ b/tests/wpt/meta/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
@@ -1,9 +1,10 @@
 [viewport-change.html]
+  expected: TIMEOUT
   [img (srcset 1 cand) valid image, resize to wide]
     expected: FAIL
 
   [picture: source (max-width:500px) broken image, img valid image, resize to wide]
-    expected: FAIL
+    expected: TIMEOUT
 
   [picture: source (max-width:500px) valid image, img valid image, resize to wide]
     expected: FAIL
@@ -15,10 +16,16 @@
     expected: FAIL
 
   [picture: source (max-width:500px) valid image, img broken image, resize to narrow]
-    expected: FAIL
+    expected: TIMEOUT
 
   [picture: source (max-width:500px) valid image, img valid image, resize to narrow]
     expected: FAIL
 
   [picture: same URL in source (max-width:500px) and img, resize to narrow]
     expected: FAIL
+
+  [picture: source (max-width:500px) valid image, img broken image, resize to wide]
+    expected: FAIL
+
+  [picture: source (max-width:500px) broken image, img valid image, resize to narrow]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-button-element/button-click-submits-with-commandfor.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-button-element/button-click-submits-with-commandfor.tentative.html.ini
new file mode 100644
index 00000000000..a878f6918de
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-button-element/button-click-submits-with-commandfor.tentative.html.ini
@@ -0,0 +1,9 @@
+[button-click-submits-with-commandfor.tentative.html]
+  [clicking a button (implicit type) should NOT trigger a submit (with command attribute)]
+    expected: FAIL
+
+  [clicking a button (implicit type) should NOT trigger a submit (with commandfor attribute)]
+    expected: FAIL
+
+  [clicking a button (implicit type) should NOT trigger a submit (with command and commandfor attribute)]
+    expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/border-rendering.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/border-rendering.tentative.html.ini
new file mode 100644
index 00000000000..64bbc4eb303
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/border-rendering.tentative.html.ini
@@ -0,0 +1,2 @@
+[border-rendering.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/native-popup-with-wrapper-div.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/native-popup-with-wrapper-div.tentative.html.ini
new file mode 100644
index 00000000000..442e9ff8098
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/native-popup-with-wrapper-div.tentative.html.ini
@@ -0,0 +1,2 @@
+[native-popup-with-wrapper-div.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/picker-and-slotted.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/picker-and-slotted.tentative.html.ini
new file mode 100644
index 00000000000..dbe8d64d385
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/picker-and-slotted.tentative.html.ini
@@ -0,0 +1,2 @@
+[picker-and-slotted.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-active.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-active.tentative.html.ini
new file mode 100644
index 00000000000..494d822cfe8
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-active.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-active.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-custom-button.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-custom-button.tentative.html.ini
new file mode 100644
index 00000000000..4206c7dda14
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-custom-button.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-custom-button.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-dark-mode.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-dark-mode.tentative.html.ini
new file mode 100644
index 00000000000..5bc744af70b
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-dark-mode.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-dark-mode.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-default-button.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-default-button.tentative.html.ini
new file mode 100644
index 00000000000..17fbd2f1fa9
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-default-button.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-default-button.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-disabled-option.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-disabled-option.tentative.html.ini
new file mode 100644
index 00000000000..f5634cbe0de
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-disabled-option.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-disabled-option.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-scroller.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-scroller.tentative.html.ini
new file mode 100644
index 00000000000..c5ea7226a7c
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-scroller.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-fallback-bottom-left-scroller.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left.tentative.html.ini
new file mode 100644
index 00000000000..bd857d4046b
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-fallback-bottom-left.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-scroller.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-scroller.tentative.html.ini
new file mode 100644
index 00000000000..a239ffd15f4
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-scroller.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-fallback-bottom-right-scroller.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right.tentative.html.ini
new file mode 100644
index 00000000000..89ec4867246
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-fallback-bottom-right.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-scroller.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-scroller.tentative.html.ini
new file mode 100644
index 00000000000..ed66a0ff78f
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-scroller.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-fallback-top-left-scroller.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left.tentative.html.ini
new file mode 100644
index 00000000000..b897599014d
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-fallback-top-left.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-scroller.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-scroller.tentative.html.ini
new file mode 100644
index 00000000000..9848bd0c399
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-scroller.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-fallback-top-right-scroller.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right.tentative.html.ini
new file mode 100644
index 00000000000..74a8afd39df
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-fallback-top-right.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-font-inheriting.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-font-inheriting.tentative.html.ini
new file mode 100644
index 00000000000..cd2e36f192d
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-font-inheriting.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-font-inheriting.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-hover.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-hover.tentative.html.ini
new file mode 100644
index 00000000000..83715ddd2e7
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-hover.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-hover.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend-and-label.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend-and-label.tentative.html.ini
new file mode 100644
index 00000000000..a3fab59b45c
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend-and-label.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-optgroup-legend-and-label.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend.tentative.html.ini
new file mode 100644
index 00000000000..4a258c7a347
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-optgroup-legend.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-rendering.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-rendering.tentative.html.ini
new file mode 100644
index 00000000000..e769240663b
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-rendering.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-optgroup-rendering.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-option-with-label.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-option-with-label.tentative.html.ini
new file mode 100644
index 00000000000..1e2849e7b73
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-option-with-label.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-option-with-label.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-picker-select-border.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-picker-select-border.tentative.html.ini
new file mode 100644
index 00000000000..a483dd09c43
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-picker-select-border.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-picker-select-border.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-switching-invalidation.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-switching-invalidation.tentative.html.ini
new file mode 100644
index 00000000000..b715815f1ff
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-switching-invalidation.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-switching-invalidation.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-lr.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-lr.tentative.html.ini
new file mode 100644
index 00000000000..3b64ad3a46a
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-lr.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-writing-mode-vertical-lr.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-rl.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-rl.tentative.html.ini
new file mode 100644
index 00000000000..a3843b0849b
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-rl.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-writing-mode-vertical-rl.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-wrong-picker-argument.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-wrong-picker-argument.tentative.html.ini
new file mode 100644
index 00000000000..a445de32614
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-appearance-wrong-picker-argument.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-appearance-wrong-picker-argument.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-explicit-size.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-explicit-size.tentative.html.ini
new file mode 100644
index 00000000000..0ea3809ac7f
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-explicit-size.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-explicit-size.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-font-size.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-font-size.tentative.html.ini
new file mode 100644
index 00000000000..878d77cdc01
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-font-size.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-font-size.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-icon-color.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-icon-color.tentative.html.ini
new file mode 100644
index 00000000000..2369a8cf7cd
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-icon-color.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-icon-color.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-only-button-opt-in.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-only-button-opt-in.tentative.html.ini
new file mode 100644
index 00000000000..07cf3be2c1f
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-only-button-opt-in.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-only-button-opt-in.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-only-picker-opt-in.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-only-picker-opt-in.tentative.html.ini
new file mode 100644
index 00000000000..8d26bd47133
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-only-picker-opt-in.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-only-picker-opt-in.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-open-invalidation.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-open-invalidation.tentative.html.ini
new file mode 100644
index 00000000000..cbc9fb2ddd5
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-open-invalidation.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-open-invalidation.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-option-images.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-option-images.tentative.html.ini
new file mode 100644
index 00000000000..599cfa5f62a
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-option-images.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-option-images.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-popover-exit-animation.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-popover-exit-animation.tentative.html.ini
new file mode 100644
index 00000000000..bb49f449bc5
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-popover-exit-animation.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-popover-exit-animation.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-second-child-button.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-second-child-button.tentative.html.ini
new file mode 100644
index 00000000000..6040839b9d1
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-second-child-button.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-second-child-button.tentative.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-selected-value-behavior.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-selected-value-behavior.tentative.html.ini
new file mode 100644
index 00000000000..aaa73a2c686
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-selected-value-behavior.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-selected-value-behavior.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-text-only.tentative.html.ini b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-text-only.tentative.html.ini
new file mode 100644
index 00000000000..86dfbe6c5d6
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/forms/the-select-element/customizable-select/select-text-only.tentative.html.ini
@@ -0,0 +1,2 @@
+[select-text-only.tentative.html]
+  expected: FAIL
diff --git a/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/rel-opener-prevents-browsing-context-group-change.tentative.html.ini b/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/rel-opener-prevents-browsing-context-group-change.tentative.html.ini
new file mode 100644
index 00000000000..71138a2347a
--- /dev/null
+++ b/tests/wpt/meta/html/semantics/links/links-created-by-a-and-area-elements/rel-opener-prevents-browsing-context-group-change.tentative.html.ini
@@ -0,0 +1,6 @@
+[rel-opener-prevents-browsing-context-group-change.tentative.html]
+  [rel=opener prevents browsing context group change]
+    expected: FAIL
+
+  [opener window feature prevents browsing context group change]
+    expected: FAIL
diff --git a/tests/wpt/meta/navigation-timing/nav2-test-timing-persistent.html.ini b/tests/wpt/meta/navigation-timing/nav2-test-timing-persistent.html.ini
index cd795880253..52e1faeed9c 100644
--- a/tests/wpt/meta/navigation-timing/nav2-test-timing-persistent.html.ini
+++ b/tests/wpt/meta/navigation-timing/nav2-test-timing-persistent.html.ini
@@ -1,3 +1,10 @@
 [nav2-test-timing-persistent.html]
+  expected: TIMEOUT
   [iframe navigation times are persistent after the iframe is removed.]
     expected: FAIL
+
+  [iframe navigation times are persistent after the iframe is removed. Part 1.]
+    expected: FAIL
+
+  [iframe navigation times are persistent after the iframe is removed Part 2.]
+    expected: TIMEOUT
diff --git a/tests/wpt/meta/resource-timing/nested-context-navigations-iframe.html.ini b/tests/wpt/meta/resource-timing/nested-context-navigations-iframe.html.ini
deleted file mode 100644
index 19a5cebdd70..00000000000
--- a/tests/wpt/meta/resource-timing/nested-context-navigations-iframe.html.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-[nested-context-navigations-iframe.html]
-  expected: TIMEOUT
-  [Test that crossorigin iframe navigations are not observable by the parent, even after history navigations by the parent]
-    expected: NOTRUN
-
-  [Test that cross-site iframe navigations are not observable by the parent, even after history navigations by the parent]
-    expected: NOTRUN
-
-  [Test that iframe navigations are not observable by the parent]
-    expected: NOTRUN
-
-  [Test that crossorigin iframe navigations are not observable by the parent]
-    expected: NOTRUN
-
-  [Test that cross-site iframe navigations are not observable by the parent]
-    expected: NOTRUN
-
-  [Test that iframe refreshes are not observable by the parent]
-    expected: NOTRUN
-
-  [Test that crossorigin iframe refreshes are not observable by the parent]
-    expected: NOTRUN
-
-  [Test that cross-site iframe refreshes are not observable by the parent]
-    expected: NOTRUN
-
-  [Test that iframe navigations are not observable by the parent, even after history navigations by the parent]
-    expected: TIMEOUT
diff --git a/tests/wpt/meta/wasm/jsapi/jspi/notraps.any.js.ini b/tests/wpt/meta/wasm/jsapi/jspi/notraps.any.js.ini
new file mode 100644
index 00000000000..443cd8e8667
--- /dev/null
+++ b/tests/wpt/meta/wasm/jsapi/jspi/notraps.any.js.ini
@@ -0,0 +1,20 @@
+[notraps.any.worker.html]
+  [catch SuspendError]
+    expected: FAIL
+
+  [throw on reentrance]
+    expected: FAIL
+
+  [unwrapped export]
+    expected: FAIL
+
+
+[notraps.any.html]
+  [catch SuspendError]
+    expected: FAIL
+
+  [throw on reentrance]
+    expected: FAIL
+
+  [unwrapped export]
+    expected: FAIL
diff --git a/tests/wpt/meta/webidl/ecmascript-binding/es-exceptions/DOMException-is-error.any.js.ini b/tests/wpt/meta/webidl/ecmascript-binding/es-exceptions/DOMException-is-error.any.js.ini
new file mode 100644
index 00000000000..f59e0d176b6
--- /dev/null
+++ b/tests/wpt/meta/webidl/ecmascript-binding/es-exceptions/DOMException-is-error.any.js.ini
@@ -0,0 +1,27 @@
+[DOMException-is-error.any.worker.html]
+  [DOMException-is-error]
+    expected: FAIL
+
+
+[DOMException-is-error.any.html]
+  [DOMException-is-error]
+    expected: FAIL
+
+
+[DOMException-is-error.https.any.shadowrealm-in-serviceworker.html]
+  expected: ERROR
+
+[DOMException-is-error.any.shadowrealm-in-sharedworker.html]
+  expected: ERROR
+
+[DOMException-is-error.any.shadowrealm-in-window.html]
+  expected: ERROR
+
+[DOMException-is-error.any.shadowrealm-in-shadowrealm.html]
+  expected: ERROR
+
+[DOMException-is-error.https.any.shadowrealm-in-audioworklet.html]
+  expected: ERROR
+
+[DOMException-is-error.any.shadowrealm-in-dedicatedworker.html]
+  expected: ERROR
diff --git a/tests/wpt/meta/workers/WorkerGlobalScope-close.html.ini b/tests/wpt/meta/workers/WorkerGlobalScope-close.html.ini
deleted file mode 100644
index 24daae4c2e7..00000000000
--- a/tests/wpt/meta/workers/WorkerGlobalScope-close.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[WorkerGlobalScope-close.html]
-  [Test sending a message after closing.]
-    expected: FAIL
diff --git a/tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini b/tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini
new file mode 100644
index 00000000000..80f9a4f15b8
--- /dev/null
+++ b/tests/wpt/meta/workers/constructors/Worker/Worker-constructor.html.ini
@@ -0,0 +1,2 @@
+[Worker-constructor.html]
+  expected: ERROR
diff --git a/tests/wpt/tests/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html b/tests/wpt/tests/FileAPI/BlobURL/cross-partition-navigation.https.html
similarity index 100%
rename from tests/wpt/tests/FileAPI/BlobURL/cross-partition-navigation.tentative.https.html
rename to tests/wpt/tests/FileAPI/BlobURL/cross-partition-navigation.https.html
diff --git a/tests/wpt/tests/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html b/tests/wpt/tests/FileAPI/BlobURL/cross-partition-worker-creation.https.html
similarity index 100%
rename from tests/wpt/tests/FileAPI/BlobURL/cross-partition-worker-creation.tentative.https.html
rename to tests/wpt/tests/FileAPI/BlobURL/cross-partition-worker-creation.https.html
diff --git a/tests/wpt/tests/FileAPI/BlobURL/cross-partition.tentative.https.html b/tests/wpt/tests/FileAPI/BlobURL/cross-partition.https.html
similarity index 100%
rename from tests/wpt/tests/FileAPI/BlobURL/cross-partition.tentative.https.html
rename to tests/wpt/tests/FileAPI/BlobURL/cross-partition.https.html
diff --git a/tests/wpt/tests/IndexedDB/fire-error-event-exception.any.js b/tests/wpt/tests/IndexedDB/fire-error-event-exception.any.js
new file mode 100644
index 00000000000..ade2a7251e3
--- /dev/null
+++ b/tests/wpt/tests/IndexedDB/fire-error-event-exception.any.js
@@ -0,0 +1,194 @@
+// META: global=window,worker
+// META: title=Fire error event - Exception thrown
+// META: script=resources/support.js
+
+// Spec: "https://w3c.github.io/IndexedDB/#fire-error-event"
+
+'use strict';
+
+setup({allow_uncaught_exception: true});
+
+function fire_error_event_test(func, description) {
+  indexeddb_test(
+      (t, db) => {
+        db.createObjectStore('s');
+      },
+      (t, db) => {
+        const tx = db.transaction('s', 'readwrite', {durability: 'relaxed'});
+        tx.oncomplete = t.unreached_func('transaction should abort');
+        const store = tx.objectStore('s');
+        store.put(0, 0);
+        const request = store.add(0, 0);
+        request.onsuccess = t.unreached_func('request should fail');
+        func(t, db, tx, request);
+        tx.addEventListener('abort', t.step_func_done(() => {
+          assert_equals(tx.error.name, 'AbortError');
+        }));
+      },
+      description);
+}
+
+// Listeners on the request.
+
+fire_error_event_test((t, db, tx, request) => {
+  request.onerror = () => {
+    throw Error();
+  };
+}, 'Exception in error event handler on request');
+
+fire_error_event_test((t, db, tx, request) => {
+  request.onerror = e => {
+    e.preventDefault();
+    throw Error();
+  };
+}, 'Exception in error event handler on request, with preventDefault');
+
+fire_error_event_test((t, db, tx, request) => {
+  request.addEventListener('error', () => {
+    throw Error();
+  });
+}, 'Exception in error event listener on request');
+
+fire_error_event_test((t, db, tx, request) => {
+  request.addEventListener('error', {
+    get handleEvent() {
+      throw new Error();
+    },
+  });
+}, 'Exception in error event listener ("handleEvent" lookup) on request');
+
+fire_error_event_test((t, db, tx, request) => {
+  request.addEventListener('error', {});
+}, 'Exception in error event listener (non-callable "handleEvent") on request');
+
+fire_error_event_test((t, db, tx, request) => {
+  request.addEventListener(
+      'error',
+      () => {
+          // no-op
+      });
+  request.addEventListener('error', () => {
+    throw Error();
+  });
+}, 'Exception in second error event listener on request');
+
+fire_error_event_test(
+    (t, db, tx, request) => {
+      let second_listener_called = false;
+      request.addEventListener('error', () => {
+        throw Error();
+      });
+      request.addEventListener('error', t.step_func(() => {
+        second_listener_called = true;
+        assert_true(
+            is_transaction_active(tx, 's'),
+            'Transaction should be active until dispatch completes');
+      }));
+      tx.addEventListener('abort', t.step_func(() => {
+        assert_true(second_listener_called);
+      }));
+    },
+    'Exception in first error event listener on request, ' +
+        'transaction active in second');
+
+// Listeners on the transaction.
+
+fire_error_event_test((t, db, tx, request) => {
+  tx.onerror = () => {
+    throw Error();
+  };
+}, 'Exception in error event handler on transaction');
+
+fire_error_event_test((t, db, tx, request) => {
+  tx.onerror = e => {
+    e.preventDefault();
+    throw Error();
+  };
+}, 'Exception in error event handler on transaction, with preventDefault');
+
+fire_error_event_test((t, db, tx, request) => {
+  tx.addEventListener('error', () => {
+    throw Error();
+  });
+}, 'Exception in error event listener on transaction');
+
+fire_error_event_test((t, db, tx, request) => {
+  tx.addEventListener(
+      'error',
+      () => {
+          // no-op
+      });
+  tx.addEventListener('error', () => {
+    throw Error();
+  });
+}, 'Exception in second error event listener on transaction');
+
+fire_error_event_test(
+    (t, db, tx, request) => {
+      let second_listener_called = false;
+      tx.addEventListener('error', () => {
+        throw Error();
+      });
+      tx.addEventListener('error', t.step_func(() => {
+        second_listener_called = true;
+        assert_true(
+            is_transaction_active(tx, 's'),
+            'Transaction should be active until dispatch completes');
+      }));
+      tx.addEventListener('abort', t.step_func(() => {
+        assert_true(second_listener_called);
+      }));
+    },
+    'Exception in first error event listener on transaction, ' +
+        'transaction active in second');
+
+// Listeners on the connection.
+
+fire_error_event_test((t, db, tx, request) => {
+  db.onerror = () => {
+    throw Error();
+  };
+}, 'Exception in error event handler on connection');
+
+fire_error_event_test((t, db, tx, request) => {
+  db.onerror = e => {
+    e.preventDefault()
+    throw Error();
+  };
+}, 'Exception in error event handler on connection, with preventDefault');
+
+fire_error_event_test((t, db, tx, request) => {
+  db.addEventListener('error', () => {
+    throw Error();
+  });
+}, 'Exception in error event listener on connection');
+
+fire_error_event_test((t, db, tx, request) => {
+  db.addEventListener(
+      'error',
+      () => {
+          // no-op
+      });
+  db.addEventListener('error', () => {
+    throw Error();
+  });
+}, 'Exception in second error event listener on connection');
+
+fire_error_event_test(
+    (t, db, tx, request) => {
+      let second_listener_called = false;
+      db.addEventListener('error', () => {
+        throw Error();
+      });
+      db.addEventListener('error', t.step_func(() => {
+        second_listener_called = true;
+        assert_true(
+            is_transaction_active(tx, 's'),
+            'Transaction should be active until dispatch completes');
+      }));
+      tx.addEventListener('abort', t.step_func(() => {
+        assert_true(second_listener_called);
+      }));
+    },
+    'Exception in first error event listener on connection, ' +
+        'transaction active in second');
diff --git a/tests/wpt/tests/IndexedDB/fire-error-event-exception.html b/tests/wpt/tests/IndexedDB/fire-error-event-exception.html
deleted file mode 100644
index f380e4081f1..00000000000
--- a/tests/wpt/tests/IndexedDB/fire-error-event-exception.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>Fire error event - Exception thrown</title>
-<link rel="help" href="https://w3c.github.io/IndexedDB/#fire-error-event">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=resources/support.js></script>
-<script>
-setup({allow_uncaught_exception:true});
-
-function fire_error_event_test(func, description) {
-  indexeddb_test(
-    (t, db) => {
-      db.createObjectStore('s');
-    },
-    (t, db) => {
-      const tx = db.transaction('s', 'readwrite', {durability: 'relaxed'});
-      tx.oncomplete = t.unreached_func('transaction should abort');
-      const store = tx.objectStore('s');
-      store.put(0, 0);
-      const request = store.add(0, 0);
-      request.onsuccess = t.unreached_func('request should fail');
-      func(t, db, tx, request);
-      tx.addEventListener('abort', t.step_func_done(() => {
-        assert_equals(tx.error.name, 'AbortError');
-      }));
-    },
-    description);
-}
-
-// Listeners on the request.
-
-fire_error_event_test((t, db, tx, request) => {
-  request.onerror = () => {
-    throw Error();
-  };
-}, 'Exception in error event handler on request');
-
-fire_error_event_test((t, db, tx, request) => {
-  request.onerror = e => {
-    e.preventDefault();
-    throw Error();
-  };
-}, 'Exception in error event handler on request, with preventDefault');
-
-fire_error_event_test((t, db, tx, request) => {
-  request.addEventListener('error', () => {
-    throw Error();
-  });
-}, 'Exception in error event listener on request');
-
-fire_error_event_test((t, db, tx, request) => {
-  request.addEventListener('error', {
-    get handleEvent() {
-      throw new Error();
-    },
-  });
-}, 'Exception in error event listener ("handleEvent" lookup) on request');
-
-fire_error_event_test((t, db, tx, request) => {
-  request.addEventListener('error', {});
-}, 'Exception in error event listener (non-callable "handleEvent") on request');
-
-fire_error_event_test((t, db, tx, request) => {
-  request.addEventListener('error', () => {
-    // no-op
-  });
-  request.addEventListener('error', () => {
-    throw Error();
-  });
-}, 'Exception in second error event listener on request');
-
-fire_error_event_test((t, db, tx, request) => {
-  let second_listener_called = false;
-  request.addEventListener('error', () => {
-    throw Error();
-  });
-  request.addEventListener('error', t.step_func(() => {
-    second_listener_called = true;
-    assert_true(is_transaction_active(tx, 's'),
-                'Transaction should be active until dispatch completes');
-  }));
-  tx.addEventListener('abort', t.step_func(() => {
-    assert_true(second_listener_called);
-  }));
-}, 'Exception in first error event listener on request, ' +
-   'transaction active in second');
-
-// Listeners on the transaction.
-
-fire_error_event_test((t, db, tx, request) => {
-  tx.onerror = () => {
-    throw Error();
-  };
-}, 'Exception in error event handler on transaction');
-
-fire_error_event_test((t, db, tx, request) => {
-  tx.onerror = e => {
-    e.preventDefault();
-    throw Error();
-  };
-}, 'Exception in error event handler on transaction, with preventDefault');
-
-fire_error_event_test((t, db, tx, request) => {
-  tx.addEventListener('error', () => {
-    throw Error();
-  });
-}, 'Exception in error event listener on transaction');
-
-fire_error_event_test((t, db, tx, request) => {
-  tx.addEventListener('error', () => {
-    // no-op
-  });
-  tx.addEventListener('error', () => {
-    throw Error();
-  });
-}, 'Exception in second error event listener on transaction');
-
-fire_error_event_test((t, db, tx, request) => {
-  let second_listener_called = false;
-  tx.addEventListener('error', () => {
-    throw Error();
-  });
-  tx.addEventListener('error', t.step_func(() => {
-    second_listener_called = true;
-    assert_true(is_transaction_active(tx, 's'),
-                'Transaction should be active until dispatch completes');
-  }));
-  tx.addEventListener('abort', t.step_func(() => {
-    assert_true(second_listener_called);
-  }));
-}, 'Exception in first error event listener on transaction, ' +
-   'transaction active in second');
-
-// Listeners on the connection.
-
-fire_error_event_test((t, db, tx, request) => {
-  db.onerror = () => {
-    throw Error();
-  };
-}, 'Exception in error event handler on connection');
-
-fire_error_event_test((t, db, tx, request) => {
-  db.onerror = e => {
-    e.preventDefault()
-    throw Error();
-  };
-}, 'Exception in error event handler on connection, with preventDefault');
-
-fire_error_event_test((t, db, tx, request) => {
-  db.addEventListener('error', () => {
-    throw Error();
-  });
-}, 'Exception in error event listener on connection');
-
-fire_error_event_test((t, db, tx, request) => {
-  db.addEventListener('error', () => {
-    // no-op
-  });
-  db.addEventListener('error', () => {
-    throw Error();
-  });
-}, 'Exception in second error event listener on connection');
-
-fire_error_event_test((t, db, tx, request) => {
-  let second_listener_called = false;
-  db.addEventListener('error', () => {
-    throw Error();
-  });
-  db.addEventListener('error', t.step_func(() => {
-    second_listener_called = true;
-    assert_true(is_transaction_active(tx, 's'),
-                'Transaction should be active until dispatch completes');
-  }));
-  tx.addEventListener('abort', t.step_func(() => {
-    assert_true(second_listener_called);
-  }));
-}, 'Exception in first error event listener on connection, ' +
-   'transaction active in second');
-
-</script>
diff --git a/tests/wpt/tests/IndexedDB/fire-success-event-exception.html b/tests/wpt/tests/IndexedDB/fire-success-event-exception.any.js
similarity index 58%
rename from tests/wpt/tests/IndexedDB/fire-success-event-exception.html
rename to tests/wpt/tests/IndexedDB/fire-success-event-exception.any.js
index eaff1b962a0..bd757ea6b1f 100644
--- a/tests/wpt/tests/IndexedDB/fire-success-event-exception.html
+++ b/tests/wpt/tests/IndexedDB/fire-success-event-exception.any.js
@@ -1,29 +1,29 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>Fire success event - Exception thrown</title>
-<link rel="help" href="https://w3c.github.io/IndexedDB/#fire-success-event">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=resources/support.js></script>
-<script>
-setup({allow_uncaught_exception:true});
+// META: global=window,worker
+// META: title=Fire success event - Exception thrown
+// META: script=resources/support.js
+
+// Spec: "https://w3c.github.io/IndexedDB/#fire-success-event"
+
+'use strict';
+
+setup({allow_uncaught_exception: true});
 
 function fire_success_event_test(func, description) {
   indexeddb_test(
-    (t, db) => {
-      db.createObjectStore('s');
-    },
-    (t, db) => {
-      const tx = db.transaction('s', 'readonly', {durability: 'relaxed'});
-      tx.oncomplete = t.unreached_func('transaction should abort');
-      const store = tx.objectStore('s');
-      const request = store.get(0);
-      func(t, db, tx, request);
-      tx.addEventListener('abort', t.step_func_done(() => {
-        assert_equals(tx.error.name, 'AbortError');
-      }));
-    },
-    description);
+      (t, db) => {
+        db.createObjectStore('s');
+      },
+      (t, db) => {
+        const tx = db.transaction('s', 'readonly', {durability: 'relaxed'});
+        tx.oncomplete = t.unreached_func('transaction should abort');
+        const store = tx.objectStore('s');
+        const request = store.get(0);
+        func(t, db, tx, request);
+        tx.addEventListener('abort', t.step_func_done(() => {
+          assert_equals(tx.error.name, 'AbortError');
+        }));
+      },
+      description);
 }
 
 fire_success_event_test((t, db, tx, request) => {
@@ -53,9 +53,11 @@ fire_success_event_test((t, db, tx, request) => {
 }, 'Exception in success event listener (non-callable "handleEvent") on request');
 
 fire_success_event_test((t, db, tx, request) => {
-  request.addEventListener('success', () => {
-    // no-op
-  });
+  request.addEventListener(
+      'success',
+      () => {
+          // no-op
+      });
   request.addEventListener('success', () => {
     throw Error();
   });
@@ -68,12 +70,11 @@ fire_success_event_test((t, db, tx, request) => {
   });
   request.addEventListener('success', t.step_func(() => {
     second_listener_called = true;
-    assert_true(is_transaction_active(tx, 's'),
-                'Transaction should be active until dispatch completes');
+    assert_true(
+        is_transaction_active(tx, 's'),
+        'Transaction should be active until dispatch completes');
   }));
   tx.addEventListener('abort', t.step_func(() => {
     assert_true(second_listener_called);
   }));
 }, 'Exception in first success event listener, tx active in second');
-
-</script>
diff --git a/tests/wpt/tests/IndexedDB/fire-upgradeneeded-event-exception.html b/tests/wpt/tests/IndexedDB/fire-upgradeneeded-event-exception.any.js
similarity index 74%
rename from tests/wpt/tests/IndexedDB/fire-upgradeneeded-event-exception.html
rename to tests/wpt/tests/IndexedDB/fire-upgradeneeded-event-exception.any.js
index 7160dbdfc7d..3b17d90f7ca 100644
--- a/tests/wpt/tests/IndexedDB/fire-upgradeneeded-event-exception.html
+++ b/tests/wpt/tests/IndexedDB/fire-upgradeneeded-event-exception.any.js
@@ -1,16 +1,14 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<title>Fire upgradeneeded event - Exception thrown</title>
-<link rel="help" href="https://w3c.github.io/IndexedDB/#fire-a-version-change-event">
-<script src=/resources/testharness.js></script>
-<script src=/resources/testharnessreport.js></script>
-<script src=resources/support.js></script>
-<script>
-setup({allow_uncaught_exception:true});
+// META: global=window,worker
+// META: title=Fire upgradeneeded event - Exception thrown
+// META: script=resources/support.js
+
+// Spec: "https://w3c.github.io/IndexedDB/#fire-a-version-change-event"
+
+setup({allow_uncaught_exception: true});
 
 function fire_upgradeneeded_event_test(func, description) {
   async_test(t => {
-    const dbname = document.location + '-' + t.name;
+    const dbname = self.location + '-' + t.name;
     const del = indexedDB.deleteDatabase(dbname);
     del.onerror = t.unreached_func('deleteDatabase should succeed');
     const open = indexedDB.open(dbname, 1);
@@ -55,9 +53,11 @@ fire_upgradeneeded_event_test((t, open) => {
 }, 'Exception in upgradeneeded due to non-callable "handleEvent"');
 
 fire_upgradeneeded_event_test((t, open) => {
-  open.addEventListener('upgradeneeded', () => {
-    // No-op.
-  });
+  open.addEventListener(
+      'upgradeneeded',
+      () => {
+          // No-op.
+      });
   open.addEventListener('upgradeneeded', () => {
     throw Error();
   });
@@ -71,12 +71,11 @@ fire_upgradeneeded_event_test((t, open) => {
   });
   open.addEventListener('upgradeneeded', t.step_func(() => {
     second_listener_called = true;
-    assert_true(is_transaction_active(open.transaction, 's'),
-                'Transaction should be active until dispatch completes');
+    assert_true(
+        is_transaction_active(open.transaction, 's'),
+        'Transaction should be active until dispatch completes');
   }));
   open.addEventListener('error', t.step_func(() => {
     assert_true(second_listener_called);
   }));
 }, 'Exception in first upgradeneeded listener, tx active in second');
-
-</script>
diff --git a/tests/wpt/tests/accname/name/comp_name_from_content.html b/tests/wpt/tests/accname/name/comp_name_from_content.html
index 32a9a7b3c43..b0c92c8142c 100644
--- a/tests/wpt/tests/accname/name/comp_name_from_content.html
+++ b/tests/wpt/tests/accname/name/comp_name_from_content.html
@@ -259,6 +259,29 @@
 <h1 data-expectedlabel="Call Us" data-testname="heading name from content with text-transform:capitalize" class="ex" style="text-transform:capitalize;">Call us</h1>
 <h1 data-expectedlabel="call us" data-testname="heading name from content with text-transform:lowercase" class="ex" style="text-transform:lowercase;">Call us</h1>
 
+<!-- Tests `Name from Each Child` edge case failures with an embedded `term` as a child element role. -->
+<!-- https://w3c.github.io/accname/#comp_name_from_content_for_each_child -->
+
+<h2>Elements with implicit button, heading, link roles containing element with implicit term role</h2>
+<button data-expectedlabel="this is an example" data-testname="implicit button name from content containing a dfn element" class="ex iblock"><span>this is an </span><dfn>example</dfn></button>
+<h3 data-expectedlabel="this is an example" data-testname="implicit heading name from content containing a dfn element" class="ex iblock"><span>this is an </span><dfn>example</dfn></h3>
+<a href="#" data-expectedlabel="this is an example" data-testname="implicit link name from content containing a dfn element" class="ex iblock"><span>this is an </span><dfn>example</dfn></a>
+
+<h2>Elements with implicit button, heading, link roles containing element with explicit term role</h2>
+<button data-expectedlabel="this is an example" data-testname="implicit button name from content containing an element with explicit term role" class="ex iblock"><span>this is an </span><span role="term">example</span></button>
+<h3 data-expectedlabel="this is an example" data-testname="implicit heading name from content containing an element with explicit term role" class="ex iblock"><span>this is an </span><span role="term">example</span></h3>
+<a href="#" data-expectedlabel="this is an example" data-testname="implicit link name from content containing an element explicit with term role" class="ex iblock"><span>this is an </span><span role="term">example</span></a>
+
+<h2>Elements with explicit button, heading, link roles containing element with implicit term role</h2>
+<div role="button" tabindex="0" data-expectedlabel="this is an example" data-testname="explicit button name from content containing a dfn element" class="ex iblock"><span>this is an </span><dfn>example</dfn></div>
+<div role="heading" data-expectedlabel="this is an example" data-testname="explicit heading name from content containing a dfn element" class="ex iblock"><span>this is an </span><dfn>example</dfn></div>
+<div role="link" tabindex="0" data-expectedlabel="this is an example" data-testname="explicit link name from content containing a dfn element" class="ex iblock"><span>this is an </span><dfn>example</dfn></div>
+
+<h2>Elements with explicit button, heading, link roles containing element with explicit term role</h2>
+<div role="button" tabindex="0" data-expectedlabel="this is an example" data-testname="explicit button name from content containing an element explicit with term role" class="ex iblock"><span>this is an </span><span role="term">example</span></div>
+<div role="heading" data-expectedlabel="this is an example" data-testname="explicit heading name from content containing an element explicit with term role" class="ex iblock"><span>this is an </span><span role="term">example</span></div>
+<div role="link" tabindex="0" data-expectedlabel="this is an example" data-testname="explicit link name from content containing an element explicit with term role" class="ex iblock"><span>this is an </span><span role="term">example</span></div>
+
 <script>
 AriaUtils.verifyLabelsBySelector(".ex");
 </script>
diff --git a/tests/wpt/tests/close-watcher/basic.html b/tests/wpt/tests/close-watcher/basic.html
index 79a91e127ef..1b092630559 100644
--- a/tests/wpt/tests/close-watcher/basic.html
+++ b/tests/wpt/tests/close-watcher/basic.html
@@ -14,7 +14,7 @@ test(t => {
 
   watcher.requestClose();
 
-  assert_array_equals(events, ["cancel[cancelable=false]", "close"]);
+  assert_array_equals(events, ["cancel[cancelable=true]", "close"]);
 }, "requestClose() with no user activation");
 
 test(t => {
@@ -43,10 +43,10 @@ test(t => {
   let watcher = createRecordingCloseWatcher(t, events);
 
   watcher.requestClose();
-  assert_array_equals(events, ["cancel[cancelable=false]", "close"]);
+  assert_array_equals(events, ["cancel[cancelable=true]", "close"]);
 
   watcher.destroy();
-  assert_array_equals(events, ["cancel[cancelable=false]", "close"]);
+  assert_array_equals(events, ["cancel[cancelable=true]", "close"]);
 }, "requestClose() then destroy()");
 
 test(t => {
diff --git a/tests/wpt/tests/close-watcher/inside-event-listeners.html b/tests/wpt/tests/close-watcher/inside-event-listeners.html
index 47f431e2503..93996fb5fee 100644
--- a/tests/wpt/tests/close-watcher/inside-event-listeners.html
+++ b/tests/wpt/tests/close-watcher/inside-event-listeners.html
@@ -30,10 +30,10 @@ test(t => {
   watcher.onclose = () => { watcher.destroy(); }
 
   watcher.requestClose();
-  assert_array_equals(events, ["cancel[cancelable=false]", "close"]);
+  assert_array_equals(events, ["cancel[cancelable=true]", "close"]);
 
   watcher.requestClose();
-  assert_array_equals(events, ["cancel[cancelable=false]", "close"], "since it was inactive, no more events fired");
+  assert_array_equals(events, ["cancel[cancelable=true]", "close"], "since it was inactive, no more events fired");
 }, "destroy() inside onclose");
 
 promise_test(async t => {
@@ -58,10 +58,10 @@ test(t => {
   watcher.onclose = () => { watcher.close(); }
 
   watcher.requestClose();
-  assert_array_equals(events, ["cancel[cancelable=false]", "close"]);
+  assert_array_equals(events, ["cancel[cancelable=true]", "close"]);
 
   watcher.requestClose();
-  assert_array_equals(events, ["cancel[cancelable=false]", "close"], "since it was inactive, no more events fired");
+  assert_array_equals(events, ["cancel[cancelable=true]", "close"], "since it was inactive, no more events fired");
 }, "close() inside onclose");
 
 promise_test(async t => {
@@ -86,9 +86,9 @@ test(t => {
   watcher.onclose = () => { watcher.requestClose(); }
 
   watcher.requestClose();
-  assert_array_equals(events, ["cancel[cancelable=false]", "close"]);
+  assert_array_equals(events, ["cancel[cancelable=true]", "close"]);
 
   watcher.requestClose();
-  assert_array_equals(events, ["cancel[cancelable=false]", "close"], "since it was inactive, no more events fired");
+  assert_array_equals(events, ["cancel[cancelable=true]", "close"], "since it was inactive, no more events fired");
 }, "requestClose() inside onclose");
 </script>
diff --git a/tests/wpt/tests/compat/webkit-box-align-001.html b/tests/wpt/tests/compat/webkit-box-align-001.html
new file mode 100644
index 00000000000..83f095ddd24
--- /dev/null
+++ b/tests/wpt/tests/compat/webkit-box-align-001.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<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://compat.spec.whatwg.org/#propdef--webkit-box-align">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1936370">
+<link rel="match" href="green-ref.html">
+<meta name="assert" content="This test checks that a legacy flex container with -webkit-box-align:start doesn't stretch the cross-axis of its items.">
+
+<style>
+.container {
+  display: -webkit-inline-box;
+  -webkit-box-align: start; /* Map to align-items: flex-start */
+  height: 100px;
+  background: green;
+}
+.item {
+  padding: 15px;
+  border-inline: 25px solid green;
+  margin: 10px;
+  aspect-ratio: 1/1;
+}
+</style>
+
+<div class="container">
+  <div class="item"></div>
+</div>
diff --git a/tests/wpt/tests/content-security-policy/reporting/report-clips-sample.https.html b/tests/wpt/tests/content-security-policy/reporting/report-clips-sample.https.html
index ae9e380bc2d..fe6b457fc7b 100644
--- a/tests/wpt/tests/content-security-policy/reporting/report-clips-sample.https.html
+++ b/tests/wpt/tests/content-security-policy/reporting/report-clips-sample.https.html
@@ -35,7 +35,7 @@
   }, `Unsafe indirect eval violation sample is clipped to ${trimmedSampleLength} characters.`);
 
   const functionBody = "return '1234567890123456789012345678901234567890';";
-  const sampleWithoutFunctionPrefix = `(a,b\n) {\nreturn ${functionBody}\n}`;
+  const sampleWithoutFunctionPrefix = `(a,b\n) {\n${functionBody}\n}`;
 
   promise_test(t => {
     assert_throws_js(EvalError, _ => {
diff --git a/tests/wpt/tests/content-security-policy/securitypolicyviolation/linenumber.tentative.html b/tests/wpt/tests/content-security-policy/securitypolicyviolation/linenumber.tentative.html
new file mode 100644
index 00000000000..3299a6af2fb
--- /dev/null
+++ b/tests/wpt/tests/content-security-policy/securitypolicyviolation/linenumber.tentative.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="content-security-policy" content="script-src 'self' 'nonce-abc'">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script nonce="abc">
+  setup({ single_test: true});
+
+  document.addEventListener("securitypolicyviolation", e => {
+    assert_equals(e.lineNumber, 18);
+    done();
+  });
+
+  location.href = "javascript: causeViolation()";
+</script
+</body>
+</html>
+
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-007.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-007.html
new file mode 100644
index 00000000000..b8aca116447
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-007.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-anchor-position-1/#anchor-pos">
+<style>
+  #query_elm {
+    position: absolute;
+    left: anchor(--a1 left);
+    top: anchor(--a1 top);
+    right: anchor(--a1 right);
+    bottom: anchor(--a1 bottom);
+    background: green;
+  }
+</style>
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:100px; height:100px; background:red;">
+  <div style="columns:3; column-fill:auto; gap:10px; inline-size:230px; block-size:100px; writing-mode:vertical-rl;">
+    <div style="block-size:30px;"></div>
+    <div style="position:relative; inline-size:100px; block-size:200px;">
+      <div style="block-size:20px;"></div>
+      <div style="anchor-name:--a1; inline-size:20px; block-size:70px;"></div>
+      <div id="query_elm"></div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-008.html b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-008.html
new file mode 100644
index 00000000000..f652b6ac2b0
--- /dev/null
+++ b/tests/wpt/tests/css/css-anchor-position/anchor-position-multicol-008.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mailto:mstensho@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-anchor-position-1/#anchor-pos">
+<style>
+  #query_elm {
+    position: absolute;
+    left: anchor(--a1 left);
+    top: anchor(--a1 top);
+    width: 80px;
+    height: 100px;
+    background: green;
+  }
+</style>
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:100px; height:100px; background:red;">
+  <div style="columns:1; inline-size:100px; column-fill:auto; border-block-end:20px solid green; block-size:70px; writing-mode:vertical-rl;">
+    <div style="block-size:30px;"></div>
+    <div style="position:relative; inline-size:100px; block-size:100px;">
+      <div style="block-size:20px;"></div>
+      <div style="anchor-name:--a1; inline-size:50px; block-size:70px;"></div>
+      <div id="query_elm"></div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-anchor-position/position-try-order-basic.html b/tests/wpt/tests/css/css-anchor-position/position-try-order-basic.html
index c7705a71bbb..f54ce44f723 100644
--- a/tests/wpt/tests/css/css-anchor-position/position-try-order-basic.html
+++ b/tests/wpt/tests/css/css-anchor-position/position-try-order-basic.html
@@ -184,14 +184,22 @@ test_order('most-block-size --bottom-sweep, --left-sweep', '--left-sweep');
 test_order('most-inline-size --right-sweep, --left-sweep, --bottom-sweep, --top-sweep', '--left-sweep');
 test_order('most-block-size --right-sweep, --left-sweep, --bottom-sweep, --top-sweep', '--top-sweep');
 
+// NOTE: the css-anchor-position-1 spec requires that only a minimum of five
+// fallback positions be respected. So this test, while intended to test across
+// all 8 fallbacks, intentionally leaves off 3 of them.
 test_order(`most-inline-size
   --right-sweep, --left-sweep, --bottom-sweep, --top-sweep,
-  --right, --left, --bottom, --top
-  `, '--left-sweep');
+  /*  --right, --left, --bottom, --top */
+  --bottom
+  `, '--bottom');
 
+// NOTE: the css-anchor-position-1 spec requires that only a minimum of five
+// fallback positions be respected. So this test, while intended to test across
+// all 8 fallbacks, intentionally leaves off 3 of them.
 test_order(`most-block-size
   --right-sweep, --left-sweep, --bottom-sweep, --top-sweep,
-  --right, --left, --bottom, --top
+  /*  --right, --left, --bottom, --top */
+  --right
   `, '--right');
 
 </script>
diff --git a/tests/wpt/tests/css/css-anchor-position/position-try-order-position-area.html b/tests/wpt/tests/css/css-anchor-position/position-try-order-position-area.html
index 3b7a3475c75..4ffbbd0b71d 100644
--- a/tests/wpt/tests/css/css-anchor-position/position-try-order-position-area.html
+++ b/tests/wpt/tests/css/css-anchor-position/position-try-order-position-area.html
@@ -183,14 +183,22 @@ test_position_area_order('most-block-size --bottom-sweep, --left-sweep', '--left
 test_position_area_order('most-inline-size --right-sweep, --left-sweep, --bottom-sweep, --top-sweep', '--left-sweep');
 test_position_area_order('most-block-size --right-sweep, --left-sweep, --bottom-sweep, --top-sweep', '--top-sweep');
 
+// NOTE: the css-anchor-position-1 spec requires that only a minimum of five
+// fallback positions be respected. So this test, while intended to test across
+// all 8 fallbacks, intentionally leaves off 3 of them.
 test_position_area_order(`most-inline-size
   --right-sweep, --left-sweep, --bottom-sweep, --top-sweep,
-  --right, --left, --bottom, --top
-  `, '--left-sweep');
+  /* --right, --left, --bottom, --top */
+  --bottom
+  `, '--bottom');
 
+// NOTE: the css-anchor-position-1 spec requires that only a minimum of five
+// fallback positions be respected. So this test, while intended to test across
+// all 8 fallbacks, intentionally leaves off 3 of them.
 test_position_area_order(`most-block-size
   --right-sweep, --left-sweep, --bottom-sweep, --top-sweep,
-  --right, --left, --bottom, --top
+  /* --right, --left, --bottom, --top */
+  --right
   `, '--right');
 
 </script>
diff --git a/tests/wpt/tests/css/css-cascade/scope-nesting.html b/tests/wpt/tests/css/css-cascade/scope-nesting.html
index 2811bb4635d..146a3f4ae28 100644
--- a/tests/wpt/tests/css/css-cascade/scope-nesting.html
+++ b/tests/wpt/tests/css/css-cascade/scope-nesting.html
@@ -677,3 +677,37 @@ test((t) => {
   assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
 }, 'Insert a CSSNestedDeclarations rule directly in top-level @scope');
 </script>
+
+<template id=test_mutate_outer_selector_text_nested_declaration>
+<style>
+  #child {
+    color: green; /* Specificity: (1, 0, 0) */
+  }
+  .b {
+    #child {
+      @scope (&) {
+        --x: 1;
+        color: red; /* Specificity: (0, 0, 0), effectively :where(:scope) */
+      }
+    }
+  }
+</style>
+<div class=a>
+  <div id=child>Foo</div>
+</div>
+</template>
+<script>
+test((t) => {
+  t.add_cleanup(() => main.replaceChildren());
+  main.append(test_mutate_outer_selector_text_nested_declaration.content.cloneNode(true));
+  assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)');
+  assert_equals(getComputedStyle(child).getPropertyValue('--x'), '');
+
+  let outer_rule = main.querySelector('style').sheet.cssRules[1];
+  assert_equals(outer_rule.selectorText, '.b');
+  outer_rule.selectorText = '.a';
+
+  assert_equals(getComputedStyle(child).color, 'rgb(0, 128, 0)'); // Unchanged.
+  assert_equals(getComputedStyle(child).getPropertyValue('--x'), '1'); // Changed.
+}, 'Mutating selectorText on outer style rule causes correct inner specificity');
+</script>
diff --git a/tests/wpt/tests/css/css-conditional/container-queries/container-units-auto.html b/tests/wpt/tests/css/css-conditional/container-queries/container-units-auto.html
new file mode 100644
index 00000000000..e2d054d7cca
--- /dev/null
+++ b/tests/wpt/tests/css/css-conditional/container-queries/container-units-auto.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<title>CSS Container Queries Test: auto sized size container unit</title>
+<link rel="help" href="https://drafts.csswg.org/css-conditional-5/#container-lengths">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #container {
+    container-type: size;
+  }
+  #target {
+    width: 100cqh;
+    height: calc(100px + 1000cqh);
+  }
+</style>
+<div id="container">
+  <div id="target"></div>
+</div>
+<script>
+  test(() => {
+    assert_equals(getComputedStyle(target).width, "0px");
+    assert_equals(getComputedStyle(target).height, "100px");
+  }, "Resolving cqh against a auto height size container should be 0");
+</script>
diff --git a/tests/wpt/tests/css/css-conditional/container-queries/size-container-auto-height.html b/tests/wpt/tests/css/css-conditional/container-queries/size-container-auto-height.html
new file mode 100644
index 00000000000..123b3ead2a9
--- /dev/null
+++ b/tests/wpt/tests/css/css-conditional/container-queries/size-container-auto-height.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<title>CSS Container Queries Test: auto sized height container query</title>
+<link rel="help" href="https://drafts.csswg.org/css-conditional-5/#size-container">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  @container (height = 0px) {
+    #target { color: green }
+  }
+</style>
+<div style="container-type:size">
+  <div id="target"></div>
+</div>
+<script>
+  test(() => {
+    assert_equals(getComputedStyle(target).color, "rgb(0, 128, 0)");
+  }, "auto height size container matches zero height query");
+</script>
diff --git a/tests/wpt/tests/css/css-content/parsing/content-invalid.html b/tests/wpt/tests/css/css-content/parsing/content-invalid.html
index c8454e557e2..efd4ea5136c 100644
--- a/tests/wpt/tests/css/css-content/parsing/content-invalid.html
+++ b/tests/wpt/tests/css/css-content/parsing/content-invalid.html
@@ -15,8 +15,6 @@
 function test_invalid_value_combinations(property, value) {
     test_invalid_value(property, value);
     test_invalid_value(property, `${value} / "alt text"`);
-    test_invalid_value(property, `${value} / "alt text" attr(foo) "bar"`);
-    test_invalid_value(property, `${value} / attr(foo)`);
 }
 
 function test_invalid_value_alt_text(property, value) {
@@ -24,7 +22,6 @@ function test_invalid_value_alt_text(property, value) {
     test_invalid_value(property, `${value} / no-open-quote`);
     test_invalid_value(property, `${value} / no-close-quote`);
     test_invalid_value(property, `${value} / "hi" no-close-quote`);
-    test_invalid_value(property, `${value} / attr(foo) open-quote`);
 }
 
 test_invalid_value_combinations("content", `attr()`);
@@ -36,9 +33,6 @@ test_invalid_value_alt_text("content", "close-quote");
 test_invalid_value_alt_text("content", "no-open-quote");
 test_invalid_value_alt_text("content", "no-close-quote");
 
-test_invalid_value_alt_text("content", "attr(alt)");
-test_invalid_value_alt_text("content", "attr(data-foo)");
-
 test_invalid_value_alt_text("content", "counter(counter-name)");
 test_invalid_value_alt_text("content", "counter(counter-name, counter-style)");
 
@@ -50,7 +44,6 @@ test_invalid_value_alt_text("content", `url("https://www.example.com/picture.svg
 test_invalid_value_alt_text("content", `"hello"`);
 
 test_invalid_value_alt_text("content", `"hello" "world"`);
-test_invalid_value_alt_text("content", `"hello" attr(alt) "world"`);
 test_invalid_value_alt_text("content", `counter(counter-name) "potato"`);
 test_invalid_value_alt_text("content", `counters(counter-name, ".") "potato"`);
 test_invalid_value_alt_text("content", `"(" counters(counter-name, ".", counter-style) ")"`);
diff --git a/tests/wpt/tests/css/css-content/parsing/content-valid.html b/tests/wpt/tests/css/css-content/parsing/content-valid.html
index 60d03a4d4c3..097bf66f62b 100644
--- a/tests/wpt/tests/css/css-content/parsing/content-valid.html
+++ b/tests/wpt/tests/css/css-content/parsing/content-valid.html
@@ -17,8 +17,6 @@ function test_valid_value_combinations(property, value, serialized) {
         serialized = value;
     test_valid_value(property, value, serialized);
     test_valid_value(property, `${value} / "alt text"`, `${serialized} / "alt text"`);
-    test_valid_value(property, `${value} / "alt text" attr(foo) "bar"`, `${serialized} / "alt text" attr(foo) "bar"`);
-    test_valid_value(property, `${value} / attr(foo)`, `${serialized} / attr(foo)`);
 }
 
 test_valid_value("content", "none");
@@ -29,9 +27,6 @@ test_valid_value_combinations("content", "close-quote");
 test_valid_value_combinations("content", "no-open-quote");
 test_valid_value_combinations("content", "no-close-quote");
 
-test_valid_value_combinations("content", "attr(alt)");
-test_valid_value_combinations("content", "attr(data-foo)");
-
 test_valid_value_combinations("content", "counter(counter-name)");
 test_valid_value_combinations("content", "counter(counter-name, counter-style)");
 test_valid_value_combinations("content", "counter(counter-name, dECiMaL)", "counter(counter-name)");
@@ -47,7 +42,6 @@ test_valid_value_combinations("content", `url("picture.svg")`);
 test_valid_value_combinations("content", `"hello"`);
 
 test_valid_value_combinations("content", `"hello" "world"`);
-test_valid_value_combinations("content", `"hello" attr(alt) "world"`);
 test_valid_value_combinations("content", `counter(counter-name) "potato"`);
 test_valid_value_combinations("content", `counters(counter-name, ".") "potato"`);
 test_valid_value_combinations("content", `"(" counters(counter-name, ".", counter-style) ")"`);
diff --git a/tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-010.html b/tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-010.html
new file mode 100644
index 00000000000..7afc53e751e
--- /dev/null
+++ b/tests/wpt/tests/css/css-flexbox/aspect-ratio-intrinsic-size-010.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<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-flexbox-1/#valdef-align-items-stretch">
+<link rel="help" href="https://drafts.csswg.org/css-sizing-3/#intrinsic-sizes">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1936370">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="This checks that a flex item with an aspect-ratio transfers its size when it also has stretch alignment.">
+
+<p>Test passes if there is a filled green square.</p>
+<div style="display: inline-flex; height: 100px; background: green;">
+  <div style="box-sizing: border-box; padding: 3px; border: 7px solid green; margin: 10px;
+              aspect-ratio: 1/1;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-flexing-002.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-flexing-002.html
new file mode 100644
index 00000000000..00782f608dd
--- /dev/null
+++ b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-flexing-002.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#flex-lines">
+<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="display: flex; flex-direction: column; flex-wrap: wrap; max-height: 100px; width: 100px;">
+  <div style="background: green; width: 50px; height: 50px; flex-grow: 1;"></div>
+  <div style="background: green; width: 50px; height: 100px;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-flexing-003.html b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-flexing-003.html
new file mode 100644
index 00000000000..fb2bd938126
--- /dev/null
+++ b/tests/wpt/tests/css/css-flexbox/flexbox-flex-wrap-flexing-003.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#flex-lines">
+<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="writing-mode: vertical-rl; display: flex; flex-direction: column; flex-wrap: wrap; max-width: 100px; height: 100px;">
+  <div style="background: green; height: 50px; width: 50px; flex-grow: 1;"></div>
+  <div style="background: green; height: 50px; width: 100px;"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-invalid.html b/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-invalid.html
index a1e6769a95c..36f26ceb163 100644
--- a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-invalid.html
+++ b/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-invalid.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>CSS Gap Decorations: column-rule-color parsing</title>
-<link rel="help" href="https://kbabbitt.github.io/css-gap-decorations/#column-row-rule-color">
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#column-row-rule-color">
 <link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
 <meta name="assert" content="column-rule-color supports only the grammar '[ <line-color-list> | <auto-line-color-list> ]'.">
 <script src="/resources/testharness.js"></script>
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-valid.html b/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-valid.html
index e8fd4df3615..d4cb5b1168f 100644
--- a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-valid.html
+++ b/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-color-valid.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>CSS Gap Decorations: parsing column-rule-color with valid values</title>
-<link rel="help" href="https://kbabbitt.github.io/css-gap-decorations/#column-row-rule-color">
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#column-row-rule-color">
 <link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
 <meta name="assert" content="column-rule-color supports the full grammar '[ <line-color-list> | <auto-line-color-list> ]'.">
 <script src="/resources/testharness.js"></script>
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html b/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html
index 379fb89c071..3d55aed80ba 100644
--- a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html
+++ b/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-computed.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>CSS Gap Decoration: column-rule-style getComputedStyle()</title>
-<link rel="help" href="https://kbabbitt.github.io/css-gap-decorations/pr-11115/Overview.html#column-row-rule-style">
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#column-row-rule-style">
 <link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
 <meta name="assert" content="column-rule-style computed value is as specified.">
 <script src="/resources/testharness.js"></script>
@@ -23,7 +23,18 @@ test_computed_value("column-rule-style", "groove");
 test_computed_value("column-rule-style", "ridge");
 test_computed_value("column-rule-style", "inset");
 
-// TODO(crbug.com/357648037): Add tests for multiple values when parsing is implemented.
+test_computed_value("column-rule-style", "dotted dashed solid");
+test_computed_value("column-rule-style", "repeat(10, double)");
+test_computed_value("column-rule-style", "repeat(3, groove) repeat(4, ridge)");
+test_computed_value("column-rule-style", "repeat(auto, solid)");
+test_computed_value("column-rule-style", "repeat(auto, dotted solid inset)");
+test_computed_value("column-rule-style", "repeat(4, none ridge solid) repeat(auto, hidden)");
+test_computed_value("column-rule-style", "inset repeat(auto, solid ridge) repeat(4, none groove hidden)");
+test_computed_value("column-rule-style", "repeat(calc(5 + 3), ridge)", "repeat(8, ridge)");
+test_computed_value("column-rule-style", "repeat(4, dotted double dashed) repeat(auto, solid) ridge");
+test_computed_value("column-rule-style", "repeat(4, dotted double dashed) repeat(auto, solid) repeat(4, none groove hidden)");
+test_computed_value("column-rule-style", "ridge repeat(auto, solid)");
+test_computed_value("column-rule-style", "ridge repeat(auto, solid) ridge");
 
 </script>
 </body>
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-invalid.html b/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-invalid.html
new file mode 100644
index 00000000000..1ea533111cd
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-invalid.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Gap Decorations: column-rule-style parsing</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#column-row-rule-style">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<meta name="assert" content="column-rule-style supports only the grammar '[ <line-style-list> | <auto-line-style-list> ]'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("column-rule-style", "auto");
+
+test_invalid_value("column-rule-style", "dashed, dotted, solid");
+test_invalid_value("column-rule-style", "repeat(auto, groove, dotted, ridge)");
+test_invalid_value("column-rule-style", "repeat(0, dotted, solid, double)");
+test_invalid_value("column-rule-style", "repeat(-1, dotted, dashed, double)");
+test_invalid_value("column-rule-style", "repeat(auto, dotted) red repeat(auto, ridge)");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-valid.html b/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-valid.html
new file mode 100644
index 00000000000..d90a9f83372
--- /dev/null
+++ b/tests/wpt/tests/css/css-gaps/tentative/parsing/gap-decorations-style-valid.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Gap Decorations: parsing column-rule-style with valid values</title>
+<link rel="help" href="https://drafts.csswg.org/css-gaps-1/#column-row-rule-style">
+<link rel="author" title="Sam Davis Omekara Jr." href="mailto:samomekarajr@microsoft.com">
+<meta name="assert" content="column-rule-style supports the full grammar '[ <line-style-list> | <auto-line-style-list> ]'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+// <repeat-line-style>  = repeat( [ <integer [1,∞]> ] , [ <style> ]+ )
+test_valid_value("column-rule-style", "repeat(4, dotted)");
+test_valid_value("column-rule-style", "repeat(3, dashed double dotted)");
+test_valid_value("column-rule-style", "repeat(1, dashed double dotted solid)");
+
+// <line-style-or-repeat> = [ <style> | <repeat-line-style> ]
+test_valid_value("column-rule-style", "dashed");
+test_valid_value("column-rule-style", "repeat(4, double)");
+
+// <line-style-list> = [ <line-style-or-repeat> ]+
+test_valid_value("column-rule-style", "dotted ridge");
+test_valid_value("column-rule-style", "dotted dashed solid groove ridge");
+test_valid_value("column-rule-style", "repeat(3, groove) repeat(4, ridge)");
+test_valid_value("column-rule-style", "inset repeat(3, ridge) none repeat(4, groove hidden dashed)");
+test_valid_value("column-rule-style", "repeat(4, none ridge solid) repeat(5, hidden) double");
+
+// <auto-repeat-line-style>   = repeat( auto , [ <style> ]+ )
+test_valid_value("column-rule-style", "repeat(auto, solid)");
+test_valid_value("column-rule-style", "repeat(auto, dotted solid inset)");
+
+// <auto-line-style-list>    = [ <line-style-or-repeat> ]*
+//                              <auto-repeat-line-style>
+//                              [ <line-style-or-repeat> ]*
+test_valid_value("column-rule-style", "repeat(auto, dashed groove) ridge");
+test_valid_value("column-rule-style", "repeat(4, dotted double dashed) repeat(auto, solid)");
+test_valid_value("column-rule-style", "inset repeat(auto, solid ridge) repeat(4, none groove hidden)");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-grid/grid-definition/flex-item-grid-container-auto-repeat-001.html b/tests/wpt/tests/css/css-grid/grid-definition/flex-item-grid-container-auto-repeat-001.html
new file mode 100644
index 00000000000..06f87974731
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/grid-definition/flex-item-grid-container-auto-repeat-001.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<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-grid-1/#auto-repeat">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1936276">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="This test verifies that the grid container's content size suggestion (min-content size) is 50px, which is contributed by only one repeat column.">
+
+<style>
+.flex {
+  display: flex;
+  width: 100px;
+  height: 100px;
+}
+.item-flex-none {
+  width: 50px;
+  flex: none;
+  background: green;
+}
+.item-grid-container {
+  display: grid;
+  width: 200%;
+  grid-template-columns: repeat(auto-fill, 50px);
+  background: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square.</p>
+<div class="flex">
+  <div class="item-flex-none"></div>
+  <div class="item-grid-container"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-grid/grid-definition/flex-item-grid-container-auto-repeat-002.html b/tests/wpt/tests/css/css-grid/grid-definition/flex-item-grid-container-auto-repeat-002.html
new file mode 100644
index 00000000000..e199190be6a
--- /dev/null
+++ b/tests/wpt/tests/css/css-grid/grid-definition/flex-item-grid-container-auto-repeat-002.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<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-grid-1/#auto-repeat">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1936276">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="This test verifies that the grid container's content size suggestion (min-content size) is 50px, which is contributed by only one repeat column.">
+
+<style>
+.flex {
+  display: flex;
+  width: 100px;
+  height: 100px;
+}
+.item-flex-none {
+  width: 50px;
+  flex: none;
+  background: green;
+}
+.item-grid-container {
+  display: grid;
+  width: 200px;
+  grid-template-columns: repeat(auto-fill, 50px);
+  background: green;
+}
+</style>
+
+<p>Test passes if there is a filled green square.</p>
+<div class="flex">
+  <div class="item-flex-none"></div>
+  <div class="item-grid-container"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-grid/parsing/grid-template-shorthand-composition.html b/tests/wpt/tests/css/css-grid/parsing/grid-template-shorthand-composition.html
index 781410d5153..2c19f737fdc 100644
--- a/tests/wpt/tests/css/css-grid/parsing/grid-template-shorthand-composition.html
+++ b/tests/wpt/tests/css/css-grid/parsing/grid-template-shorthand-composition.html
@@ -31,9 +31,60 @@ testValidGridTemplate("none",  "none", "none", "none");
 testValidGridTemplate("auto",  "auto", "none", "auto / auto");
 
 // `[ <line-names>? <string> <track-size>? <line-names>? ]+ [ / <explicit-track-list> ]?`
-testValidGridTemplate("[header-top] auto [header-bottom main-top] 1fr [main-bottom]", "auto 1fr auto", "\"a a a\" \"b b b\"", "[header-top] \"a a a\" [header-bottom main-top] \"b b b\" 1fr [main-bottom] / auto 1fr auto");
-testValidGridTemplate("auto",  "auto", "\"a a a\" \"b b b\"", "\"a a a\" \"b b b\" / auto");
-testValidGridTemplate("min-content", "min-content", "\"a a a\" \"b b b\" \"c c c\" \"d d d\"", "\"a a a\" min-content \"b b b\" \"c c c\" \"d d d\" / min-content");
+testValidGridTemplate(
+  "[header-top] auto [header-bottom main-top] 1fr [main-bottom]",
+  "auto 1fr auto",
+  '"a a a" "b b b"',
+  '[header-top] "a a a" [header-bottom main-top] "b b b" 1fr [main-bottom] / auto 1fr auto',
+);
+testValidGridTemplate(
+  "auto",
+  "auto",
+  '"a a a" "b b b"',
+  "",
+);
+testValidGridTemplate(
+  "auto",
+  "auto auto",
+  '"a a a" "b b b"',
+  "",
+);
+testValidGridTemplate(
+  "auto auto",
+  "auto",
+  '"a a a" "b b b"',
+  '"a a a" "b b b" / auto',
+);
+testValidGridTemplate(
+  "auto auto",
+  "auto auto",
+  '"a a a" "b b b"',
+  '"a a a" "b b b" / auto auto',
+);
+testValidGridTemplate(
+  "min-content",
+  "min-content",
+  '"a a a" "b b b" "c c c" "d d d"',
+  "",
+);
+testValidGridTemplate(
+  "min-content",
+  "min-content auto auto auto",
+  '"a a a" "b b b" "c c c" "d d d"',
+  "",
+);
+testValidGridTemplate(
+  "min-content auto auto auto",
+  "min-content",
+  '"a a a" "b b b" "c c c" "d d d"',
+  '"a a a" min-content "b b b" "c c c" "d d d" / min-content',
+);
+testValidGridTemplate(
+  "min-content auto auto auto",
+  "min-content auto auto auto",
+  '"a a a" "b b b" "c c c" "d d d"',
+  '"a a a" min-content "b b b" "c c c" "d d d" / min-content auto auto auto',
+);
 </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-single-stop-longer-hue-hsl-002-ref.html b/tests/wpt/tests/css/css-images/gradient/gradient-single-stop-longer-hue-hsl-002-ref.html
new file mode 100644
index 00000000000..2862a7a7ab8
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-single-stop-longer-hue-hsl-002-ref.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <title>Gradient in HSL space - reference</title>
+    <link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+    <style>
+        body {
+            background: #fff;
+        }
+
+        div {
+            width: 200px;
+            height: 50px;
+            margin: 10px;
+            background-image: linear-gradient(to right in hsl longer hue, red 0%, red var(--pos) var(--pos), red 100%);
+        }
+    </style>
+</head>
+
+<body>
+    <div style="--pos: 0%"></div>
+    <div style="--pos: 25%"></div>
+    <div style="--pos: 50%"></div>
+    <div style="--pos: 75%"></div>
+    <div style="--pos: 100%"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-images/gradient/gradient-single-stop-longer-hue-hsl-002.html b/tests/wpt/tests/css/css-images/gradient/gradient-single-stop-longer-hue-hsl-002.html
new file mode 100644
index 00000000000..da78d6e1cc5
--- /dev/null
+++ b/tests/wpt/tests/css/css-images/gradient/gradient-single-stop-longer-hue-hsl-002.html
@@ -0,0 +1,33 @@
+<!doctype html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <title>Gradient in HSL space</title>
+    <meta name="fuzzy" content="maxDifference=0-8;totalPixels=0-9050">
+    <link rel="author" title="Jonathan Kew" href="mailto:jkew@mozilla.com">
+    <link rel="help" href="https://www.w3.org/TR/css-color-4/#interpolation">
+    <meta name="assert" content="Tests that a single-stop longer-hue (wrapping) gradient renders as expected for various stop positions">
+    <link rel="match" href="gradient-single-stop-longer-hue-hsl-002-ref.html">
+    <style>
+        body {
+            background: #fff;
+        }
+
+        div {
+            width: 200px;
+            height: 50px;
+            margin: 10px;
+            background-image: linear-gradient(to right in hsl longer hue, red var(--pos) var(--pos));
+        }
+    </style>
+</head>
+
+<body>
+    <div style="--pos: 0%"></div>
+    <div style="--pos: 25%"></div>
+    <div style="--pos: 50%"></div>
+    <div style="--pos: 75%"></div>
+    <div style="--pos: 100%"></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-fill-computed.html b/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-fill-computed.html
new file mode 100644
index 00000000000..44ff30b8cd9
--- /dev/null
+++ b/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-fill-computed.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Masonry: masonry-fill getComputedStyle()</title>
+  <link rel="author" title="Celeste Pan" href="mailto:celestepan@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/css/support/computed-testcommon.js"></script>
+  <script src="/css/support/inheritance-testcommon.js"></script>
+</head>
+<body>
+  <div id="target"></div>
+  </div>
+  <script>
+    test_computed_value("masonry-fill", "normal");
+    test_computed_value("masonry-fill", "reverse");
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-fill-invalid.html b/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-fill-invalid.html
new file mode 100644
index 00000000000..10ccde781ff
--- /dev/null
+++ b/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-fill-invalid.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Masonry: parsing masonry-fill with invalid values</title>
+  <link rel="author" title="Celeste Pan" href="mailto:celestepan@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+  <div id="target"></div>
+  <script>
+    test_invalid_value('masonry-fill', '10');
+    test_invalid_value('masonry-fill', 'true');
+    test_invalid_value('masonry-fill', 'default');
+    test_invalid_value('masonry-fill', 'set');
+    test_invalid_value('masonry-fill', 'before, after');
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-fill-valid.html b/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-fill-valid.html
new file mode 100644
index 00000000000..23498d40215
--- /dev/null
+++ b/tests/wpt/tests/css/css-masonry/tentative/parsing/masonry-fill-valid.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Masonry: parsing masonry-fill with valid values</title>
+  <link rel="author" title="Celeste Pan" href="mailto:celestepan@microsoft.com">
+  <link rel="help" href="https://drafts.csswg.org/css-grid-3">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <script src="/css/support/parsing-testcommon.js"></script>
+</head>
+<body>
+  <div id="target"></div>
+  <script>
+    test_valid_value('masonry-fill', 'normal');
+    test_valid_value('masonry-fill', 'reverse');
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-nesting/set-selector-text.html b/tests/wpt/tests/css/css-nesting/set-selector-text.html
new file mode 100644
index 00000000000..fe216a9edbc
--- /dev/null
+++ b/tests/wpt/tests/css/css-nesting/set-selector-text.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<title>CSS Nesting: Mutating selectorText of outer rule</title>
+<link rel="help" href="https://drafts.csswg.org/css-nesting/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style id=style>
+</style>
+<main style="container-type:size;width:50px;height:50px">
+  <div class=a>
+    <div class=x></div>
+  </div>
+  <div class=b>
+    <div class=x></div>
+  </div>
+</main>
+<script>
+  let cases = [
+    ['style',        '.a { & .x { z-index: 1; } }'],
+    ['@media',       '.a { @media (width) { & .x { z-index: 1; } } }'],
+    ['@supports',    '.a { @supports (width:1px) { & .x { z-index: 1; } } }'],
+    ['@layer',       '.a { @layer foo { & .x { z-index: 1; } } }'],
+    ['@container',   '.a { @container (width) { & .x { z-index: 1; } } }'],
+    ['@scope',       '.a { @scope (&) { & .x { z-index: 1; } } }'],
+    ['nested decl.', '.a { & .x { .y { } z-index: 1; } } '],
+  ];
+
+  for (let [test_name, style_text] of cases) {
+    test((t) => {
+      t.add_cleanup(() => { style.textContent = ''; });
+      style.textContent = style_text;
+      let ax = document.querySelector('.a > .x');
+      let bx = document.querySelector('.b > .x');
+      assert_equals(getComputedStyle(ax).zIndex, '1',
+        'z-index of "ax" element before selectorText mutation');
+      assert_equals(getComputedStyle(bx).zIndex, 'auto',
+        'z-index of "bx" element before selectorText mutation');
+      style.sheet.cssRules[0].selectorText = '.b';
+      assert_equals(getComputedStyle(ax).zIndex, 'auto',
+        'z-index of "ax" element after selectorText mutation');
+      assert_equals(getComputedStyle(bx).zIndex, '1',
+        'z-index of "bx" element after selectorText mutation');
+    }, `Outer selectorText text mutation with inner ${test_name} rule`);
+  }
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/add-scroller-then-scroll-content-into-view.html b/tests/wpt/tests/css/css-overflow/add-scroller-then-scroll-content-into-view.html
new file mode 100644
index 00000000000..bbe4ec33c94
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/add-scroller-then-scroll-content-into-view.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://crbug.com/364669904">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/rendering-utils.js"></script>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="scroller" style="position: relative; overflow: scroll; scrollbar-width: none;
+                          width: 200px; height: 200px; display: none">
+  <div style="height: 2000px"></div>
+  <div style="position: absolute; top: 1000px;
+              width: 100px; height: 100px; background: green"></div>
+</div>
+<script>
+waitForAtLeastOneFrame().then(() => {
+  scroller.style.display = 'block';
+  waitForAtLeastOneFrame().then(() => {
+    scroller.scrollTo(0, 1000);
+    takeScreenshot();
+  });
+});
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/content-change-then-scroll-into-view.html b/tests/wpt/tests/css/css-overflow/content-change-then-scroll-into-view.html
new file mode 100644
index 00000000000..ec8836d5cb9
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/content-change-then-scroll-into-view.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://crbug.com/364669904">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/rendering-utils.js"></script>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="scroller" style="position: relative; overflow: scroll; scrollbar-width: none;
+                          width: 200px; height: 200px">
+  <div style="height: 2000px"></div>
+  <div id="content" style="position: absolute; top: 1000px; background: red;
+                           width: 100px; height: 100px"></div>
+</div>
+<script>
+waitForAtLeastOneFrame().then(() => {
+  content.style.background = 'green';
+  waitForAtLeastOneFrame().then(() => {
+    scroller.scrollTo(0, 1000);
+    takeScreenshot();
+  });
+});
+</script>
diff --git a/tests/wpt/tests/css/css-overflow/line-clamp/webkit-line-clamp-abspos-001.html b/tests/wpt/tests/css/css-overflow/line-clamp/webkit-line-clamp-abspos-001.html
new file mode 100644
index 00000000000..be7798c2119
--- /dev/null
+++ b/tests/wpt/tests/css/css-overflow/line-clamp/webkit-line-clamp-abspos-001.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>line-clamping shouldn't prevent abspos content from painting</title>
+<link rel="author" href="mailto:dholbert@mozilla.com" title="Daniel Holbert">
+<link rel="author" href="https://mozilla.org" title="Mozilla">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<link rel="help" href="https://drafts.csswg.org/css-overflow-4/#propdef--webkit-line-clamp">
+<link rel="help" href="https://bugzil.la/1934547">
+<style>
+.line-clamp {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  position: relative;
+  overflow: hidden;
+  height: 100px;
+  width: 100px;
+}
+.abspos {
+  position: absolute;
+  top: 0;
+  left: 0;
+  height: 100px;
+  width: 100px;
+  background: green;
+}
+</style>
+<p>Test passes if there is a filled green square.</p>
+
+<div class="line-clamp">
+  FAIL<br>
+  FAIL<br>
+  FAIL<br>
+  <div class="abspos"></div>
+</div>
diff --git a/tests/wpt/tests/css/css-pseudo/highlight-cascade/highlight-cascade-010.html b/tests/wpt/tests/css/css-pseudo/highlight-cascade/highlight-cascade-010.html
new file mode 100644
index 00000000000..bbfcffb16aa
--- /dev/null
+++ b/tests/wpt/tests/css/css-pseudo/highlight-cascade/highlight-cascade-010.html
@@ -0,0 +1,29 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Pseudo-Elements Test: highlight styling: late property registration updates highlights</title>
+<link rel="author" title="Stephen Chenney" href="mailto:schenney@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#highlight-cascade">
+<meta name="assert" value="This test verifies that custom property values when defined on a highlight pseudo update when the property registration happens after first style recalc.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+    #originating::spelling-error {
+        color: white;
+        --x: initial;
+        background-color: var(--x, red);
+    }
+</style>
+<div id="originating">Text wth a spelling error</div>
+<script>
+  promise_test(async () => {
+    await new Promise(requestAnimationFrame);
+    CSS.registerProperty({
+      name: '--x',
+      inherits: true,
+      initialValue: "green"
+    });
+    await new Promise(requestAnimationFrame);
+    const originating_spelling = getComputedStyle(document.querySelector("div"), "::spelling-error");
+    assert_equals(originating_spelling.getPropertyValue("--x"), "green");
+  }, "the custom property receives its initial value from a deferred registration");
+</script>
diff --git a/tests/wpt/tests/css/css-rhythm/computedstyle/block-level-replaced-elements-affected-by-block-step-size.html b/tests/wpt/tests/css/css-rhythm/computedstyle/block-level-replaced-elements-affected-by-block-step-size.html
new file mode 100644
index 00000000000..fdbd0da1208
--- /dev/null
+++ b/tests/wpt/tests/css/css-rhythm/computedstyle/block-level-replaced-elements-affected-by-block-step-size.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm/#block-step-size">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<meta name="assert" content="Checks getComputedStyle for block level replaced margins affected by block-step-size and height of their containers">
+<style>
+.container {
+  display: inline flow-root;
+  width: 100px;
+}
+.block-step {
+  display: block;
+  block-step-size: 100px;
+  visibility: hidden;
+}
+
+iframe {
+  border: 0;
+}
+
+</style>
+</head>
+<body onload="checkLayout('.test')">
+
+<div class="container test" data-expected-height="100">
+  <img class="block-step test" src="../../support/60x60-green.png" data-expected-margin-top="20" data-expected-margin-bottom="20"></img>
+</div>
+
+<div class="container test" data-expected-height="100">
+  <canvas width="20" height="20" class="block-step test" data-expected-margin-top="40" data-expected-margin-bottom="40"></canvas>
+</div>
+
+<div class="container test" data-expected-height="100">
+  <svg class="block-step test" viewBox="0 0 100 50" data-expected-margin-top="25" data-expected-margin-bottom="25"></svg>
+</div>
+
+<div class="container test" data-expected-height="100">
+  <embed type="text/xml" width="20" height="20" class="block-step test" data-expected-margin-top="40" data-expected-margin-bottom="40"></embed>
+</div>
+<div class="container test" data-expected-height="100">
+  <iframe src="" width="20" height="20" class="block-step test" data-expected-margin-top="40" data-expected-margin-bottom="40"></iframe>
+</div>
+
+<div class="container test" data-expected-height="100">
+  <object width="20" height="20" class="block-step test" data-expected-margin-top="40" data-expected-margin-bottom="40"></object>
+</div>
+
+<div class="container test" data-expected-height="100">
+  <video width="20" height="20" class="block-step test" data-expected-margin-top="40" data-expected-margin-bottom="40"></video>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-rhythm/computedstyle/inline-level-replaced-elements-not-affected-by-block-step-size.html b/tests/wpt/tests/css/css-rhythm/computedstyle/inline-level-replaced-elements-not-affected-by-block-step-size.html
new file mode 100644
index 00000000000..0531c7edbdc
--- /dev/null
+++ b/tests/wpt/tests/css/css-rhythm/computedstyle/inline-level-replaced-elements-not-affected-by-block-step-size.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm/#block-step-size">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<meta name="assert" content="Check inline level replaced elements are not affected by block-step-size via getComputedStyle">
+<style>
+.container {
+  display: inline flow-root;
+  width: 100px;
+  font-size: 0px;
+}
+.block-step {
+  block-step-size: 100px;
+  visibility: hidden;
+}
+
+iframe {
+  border: 0;
+}
+
+</style>
+</head>
+<body onload="checkLayout('.test')">
+
+<div class="container test" data-expected-height="60">
+  <img class="block-step test" src="../../support/60x60-green.png" data-expected-margin-top="0" data-expected-margin-bottom="0"></img>
+</div>
+
+<div class="container test" data-expected-height="20">
+  <canvas width="20" height="20" class="block-step test" data-expected-margin-top="0" data-expected-margin-bottom="0"></canvas>
+</div>
+
+<div class="container test" data-expected-height="20">
+  <svg class="block-step test" viewBox="0 0 100 20" data-expected-margin-top="0" data-expected-margin-bottom="0"></svg>
+</div>
+
+<div class="container test" data-expected-height="20">
+  <embed type="text/xml" width="20" height="20" class="block-step test" data-expected-margin-top="0" data-expected-margin-bottom="0"></embed>
+</div>
+<div class="container test" data-expected-height="20">
+  <iframe src="" width="20" height="20" class="block-step test" data-expected-margin-top="0" data-expected-margin-bottom="0"></iframe>
+</div>
+
+<div class="container test" data-expected-height="20">
+  <object width="20" height="20" class="block-step test" data-expected-margin-top="0" data-expected-margin-bottom="0"></object>
+</div>
+
+<div class="container test" data-expected-height="20">
+  <video width="20" height="20" class="block-step test" data-expected-margin-top="0" data-expected-margin-bottom="0"></video>
+</div>
+
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-canvas-margins-affected-by-block-step-size.html b/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-canvas-margins-affected-by-block-step-size.html
new file mode 100644
index 00000000000..e51a0135353
--- /dev/null
+++ b/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-canvas-margins-affected-by-block-step-size.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm/#block-step-size">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Block level canvas is affected by block-step-size">
+<style>
+.container {
+  display: flow-root;
+  width: 100px;
+  background-color: green;
+}
+.block-step {
+  display: block;
+  block-step-size: 100px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if there is a filled green square.</p>
+<div class="container">
+  <canvas width="20" height="20" class="block-step"></canvas>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-embed-margins-affected-by-block-step-size.html b/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-embed-margins-affected-by-block-step-size.html
new file mode 100644
index 00000000000..d82f466d086
--- /dev/null
+++ b/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-embed-margins-affected-by-block-step-size.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm/#block-step-size">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Block level embed is affected by block-step-size">
+<style>
+.container {
+  display: flow-root;
+  width: 100px;
+  background-color: green;
+}
+.block-step {
+  display: block;
+  block-step-size: 100px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if there is a filled green square.</p>
+<div class="container">
+  <embed type="text/xml" width="20" height="20" class="block-step"></embed>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-iframe-margins-affected-by-block-step-size.html b/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-iframe-margins-affected-by-block-step-size.html
new file mode 100644
index 00000000000..b591b896ab2
--- /dev/null
+++ b/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-iframe-margins-affected-by-block-step-size.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm/#block-step-size">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Block level iframe is affected by block-step-size">
+<style>
+.container {
+  display: flow-root;
+  width: 100px;
+  background-color: green;
+}
+.block-step {
+  display: block;
+  block-step-size: 100px;
+  visibility: hidden;
+}
+</style>
+</head>
+<body>
+<p>Test passes if there is a filled green square.</p>
+<div class="container">
+  <iframe src="" width="20" height="20" class="block-step"></iframe>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-img-margins-affected-by-block-step-size.html b/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-img-margins-affected-by-block-step-size.html
new file mode 100644
index 00000000000..d6177987cc9
--- /dev/null
+++ b/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-img-margins-affected-by-block-step-size.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm/#block-step-size">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Block level img is affected by block-step-size">
+<style>
+.container {
+  display: flow-root;
+  width: 100px;
+  background-color: green;
+}
+.block-step {
+  block-step-size: 100px;
+  display: block;
+}
+</style>
+</head>
+<body>
+<p>Test passes if there is a filled green square.</p>
+<div class="container">
+  <img class="block-step" src="../../support/60x60-green.png"></img>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-object-margins-affected-by-block-step-size.html b/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-object-margins-affected-by-block-step-size.html
new file mode 100644
index 00000000000..b9a0f0ef4a3
--- /dev/null
+++ b/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-object-margins-affected-by-block-step-size.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm/#block-step-size">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Block level object is affected by block-step-size">
+<style>
+.container {
+  display: flow-root;
+  width: 100px;
+  background-color: green;
+}
+.block-step {
+  display: block;
+  block-step-size: 100px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if there is a filled green square.</p>
+<div class="container">
+  <object width="20" height="20" class="block-step"></object>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-svg-margins-affected-by-block-step-size.html b/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-svg-margins-affected-by-block-step-size.html
new file mode 100644
index 00000000000..cbdabeaff54
--- /dev/null
+++ b/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-svg-margins-affected-by-block-step-size.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm/#block-step-size">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Block level SVG is affected by block-step-size">
+<style>
+.container {
+  display: flow-root;
+  background-color: green;
+  width: 100px;
+}
+.block-step {
+  display: block;
+  block-step-size: 100px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if there is a filled green square.</p>
+<div class="container">
+  <svg class="block-step" viewBox="0 0 100 50"></svg>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-video-margins-affected-by-block-step-size.html b/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-video-margins-affected-by-block-step-size.html
new file mode 100644
index 00000000000..8d822cfcd5c
--- /dev/null
+++ b/tests/wpt/tests/css/css-rhythm/replaced-elements/block-level-video-margins-affected-by-block-step-size.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="author" title="Sammy Gill" href="mailto:sammy.gill@apple.com">
+<link rel="help" href="https://drafts.csswg.org/css-rhythm/#block-step-size">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Block level video is affected by block-step-size">
+<style>
+.container {
+  display: flow-root;
+  width: 100px;
+  background-color: green;
+}
+.block-step {
+  display: block;
+  block-step-size: 100px;
+}
+</style>
+</head>
+<body>
+<p>Test passes if there is a filled green square.</p>
+<div class="container">
+  <video width="20" height="20" class="block-step"></video>
+</div>
+</body>
+</html>
diff --git a/tests/wpt/tests/css/css-ruby/ruby-body-element-crash.html b/tests/wpt/tests/css/css-ruby/ruby-body-element-crash.html
new file mode 100644
index 00000000000..c1487ab6162
--- /dev/null
+++ b/tests/wpt/tests/css/css-ruby/ruby-body-element-crash.html
@@ -0,0 +1,15 @@
+<link rel=help href="https://bugzilla.mozilla.org/show_bug.cgi?id=1935728">
+<script>
+document.addEventListener("DOMContentLoaded", () => {
+  document.body.getBoundingClientRect();
+  document.body.parentNode.removeChild(document.body)
+  document.body.getBoundingClientRect();
+})
+</script>
+<style>
+body {
+  display: ruby-text;
+  overflow: scroll;
+}
+</style>
+<body>
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-computed.html b/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-computed.html
index 1ebb5e78654..50dbcff2397 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-computed.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-computed.html
@@ -3,8 +3,8 @@
 
 <head>
   <meta charset="utf-8">
-  <title> CSS Scroll Snap 2 Test: scroll-start-target-* computed values</title>
-  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start-target">
+  <title> CSS Scroll Snap 2 Test: scroll-initial-target-* computed values</title>
+  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="/css/support/computed-testcommon.js"></script>
@@ -13,8 +13,8 @@
 <body>
   <div id="target"></div>
   <script>
-    test_computed_value("scroll-start-target", "auto");
-    test_computed_value("scroll-start-target", "none");
+    test_computed_value("scroll-initial-target", "nearest");
+    test_computed_value("scroll-initial-target", "none");
     </script>
 </body>
 
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-invalid.html b/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-invalid.html
index f2a60836d1d..dfcaaabdeed 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-invalid.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-invalid.html
@@ -2,19 +2,19 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <title> CSS Scroll Snap 2 Test: scroll-start-target-* with invalid values</title>
-  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start">
+  <title> CSS Scroll Snap 2 Test: scroll-initial-target-* with invalid values</title>
+  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="/css/support/parsing-testcommon.js"></script>
 </head>
 <body>
   <script>
-    test_invalid_value("scroll-start-target", "invalid_keyword");
-    test_invalid_value("scroll-start-target", "100px");
-    test_invalid_value("scroll-start-target", "none none none");
-    test_invalid_value("scroll-start-target", "invalid_keyword1 invalid_keyword2");
-    test_invalid_value("scroll-start-target", "100px 100px");
+    test_invalid_value("scroll-initial-target", "invalid_keyword");
+    test_invalid_value("scroll-initial-target", "100px");
+    test_invalid_value("scroll-initial-target", "none none none");
+    test_invalid_value("scroll-initial-target", "invalid_keyword1 invalid_keyword2");
+    test_invalid_value("scroll-initial-target", "100px 100px");
   </script>
 </body>
 </html>
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-valid.html b/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-valid.html
index 9ff7055a81c..3397f19e50c 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-valid.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/parsing/scroll-start-target-valid.html
@@ -3,8 +3,8 @@
 
 <head>
   <meta charset="utf-8">
-  <title> CSS Scroll Snap 2 Test: scroll-start-target-* with valid values</title>
-  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start-target">
+  <title> CSS Scroll Snap 2 Test: scroll-initial-target-* with valid values</title>
+  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="/css/support/parsing-testcommon.js"></script>
@@ -12,8 +12,8 @@
 
 <body>
   <script>
-    test_valid_value("scroll-start-target", "none");
-    test_valid_value("scroll-start-target", "auto");
+    test_valid_value("scroll-initial-target", "none");
+    test_valid_value("scroll-initial-target", "nearest");
   </script>
 </body>
 
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-aligns-with-snap-align.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-aligns-with-snap-align.tentative.html
similarity index 91%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-aligns-with-snap-align.tentative.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-aligns-with-snap-align.tentative.html
index 3203e1e1a61..8dc76a657d7 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-aligns-with-snap-align.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-aligns-with-snap-align.tentative.html
@@ -2,8 +2,8 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title> CSS Scroll Snap 2 Test: scroll-start-target*</title>
-    <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start-target">
+    <title> CSS Scroll Snap 2 Test: scroll-initial-target*</title>
+    <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/dom/events/scrolling/scroll_support.js"></script>
@@ -26,7 +26,7 @@
         width: 100px;
         height: 100px;
         background-color: pink;
-        scroll-start-target: auto;
+        scroll-initial-target: nearest;
         position: absolute;
         top: 400px;
         left: 400px;
@@ -68,7 +68,7 @@
             "scroller is vertically aligned to target's top");
         assert_equals(scroller.scrollLeft, 400,
             "scroller is horizontally aligned to target's left");
-      }, "scroll-start-target aligns with scroll-snap-align");
+      }, "scroll-initial-target aligns with scroll-snap-align");
     </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-display-toggled.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-display-toggled.tentative.html
similarity index 88%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-display-toggled.tentative.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-display-toggled.tentative.html
index a0224a568e5..2f58e2393c7 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-display-toggled.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-display-toggled.tentative.html
@@ -2,8 +2,8 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title> CSS Scroll Snap 2 Test: scroll-start-target*</title>
-    <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start-target">
+    <title> CSS Scroll Snap 2 Test: scroll-initial-target*</title>
+    <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
   </head>
@@ -33,7 +33,7 @@
         width: 100px;
         height: 100px;
         background-color: pink;
-        scroll-start-target: auto;
+        scroll-initial-target: nearest;
       }
     </style>
     <div id="outer-container">
@@ -89,7 +89,7 @@
         let initial_expected_scroll_top =
             total_content_height - inner_scroller.clientHeight;
         assert_equals(inner_scroller.scrollTop, initial_expected_scroll_top,
-          "inner-scroller is scrolled to scroll-start-target");
+          "inner-scroller is scrolled to scroll-initial-target");
 
         let display_promise = waitForDisplay(target, "none");
         target.style.display = "none";
@@ -98,14 +98,14 @@
         let final_expected_scroll_top = initial_expected_scroll_top - target_height;
         assert_equals(inner_scroller.scrollTop, final_expected_scroll_top,
           "inner scroller is clamped to updated scroll range");
-      }, "display:block scroll-start-target becomes display: none");
+      }, "display:block scroll-initial-target becomes display: none");
 
       promise_test(async (t) => {
         await resetDisplay();
         let initial_expected_scroll_top =
             total_content_height - inner_scroller.clientHeight;
         assert_equals(inner_scroller.scrollTop, initial_expected_scroll_top,
-          "inner-scroller is scrolled to scroll-start-target");
+          "inner-scroller is scrolled to scroll-initial-target");
 
         let display_promise = waitForDisplay(target, "none");
         target.style.display = "none";
@@ -118,8 +118,8 @@
         target.style.display = "block";
         await display_promise;
         assert_equals(inner_scroller.scrollTop, initial_expected_scroll_top,
-            "inner scroller is updated as scroll-start-target reappears");
-      }, "display:none scroll-start-target becomes display: block");
+            "inner scroller is updated as scroll-initial-target reappears");
+      }, "display:none scroll-initial-target becomes display: block");
     </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-nested-container.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-nested-container.tentative.html
similarity index 82%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-nested-container.tentative.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-nested-container.tentative.html
index e3a1df6e6a1..cd2717ed88c 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-nested-container.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-nested-container.tentative.html
@@ -2,8 +2,8 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title> CSS Scroll Snap 2 Test: scroll-start-target*</title>
-    <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start-target">
+    <title> CSS Scroll Snap 2 Test: scroll-initial-target*</title>
+    <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/resources/testdriver.js"></script>
@@ -49,7 +49,7 @@
         width: 100px;
         height: 100px;
         background-color: pink;
-        scroll-start-target: auto;
+        scroll-initial-target: nearest;
       }
     </style>
     <div id="outer-container">
@@ -96,7 +96,7 @@
       promise_test(async (t) => {
         await resetDisplay();
         assert_equals(outer_container.scrollTop, outer_to_target_scrolltop,
-          "outer-container is scrolled to scroll-start-target");
+          "outer-container is scrolled to scroll-initial-target");
 
         // Remove large_space_outer so we can observe outer-container adjust to
         // its new content height.
@@ -113,14 +113,14 @@
         await waitForAnimationFrames(2);
 
         assert_equals(outer_container.scrollTop, outer_to_target_scrolltop,
-            "outer-scroller is updated as scroll-start-target reappears");
-      }, "display:none scroll-start-target becomes display:block");
+            "outer-scroller is updated as scroll-initial-target reappears");
+      }, "display:none scroll-initial-target becomes display:block");
 
       promise_test(async (t) => {
         await waitForCompositorCommit();
         await resetDisplay();
         assert_equals(outer_container.scrollTop, outer_to_target_scrolltop,
-            "outer-container is scrolled to scroll-start-target");
+            "outer-container is scrolled to scroll-initial-target");
 
         // Remove large_space_outer so we can observe outer-container adjust to
         // its new content height.
@@ -129,7 +129,7 @@
         await waitForAnimationFrames(2);
 
         // inner-container has become a scroller and should be scrolled to
-        // scroll-start-target.
+        // scroll-initial-target.
         assert_equals(inner_container.scrollTop,
           inner_to_target_scrolltop,
           "inner-container is fully scrolled to target");
@@ -152,21 +152,21 @@
 
       promise_test(async (t) => {
         // This test verifies that:
-        // 1. when both the child and grandchild are scroll-start-targets, the
+        // 1. when both the child and grandchild are scroll-initial-targets, the
         //    first-in-tree-order (i.e. the child) wins/is scrolled to.
-        // 2. if/when the grandchild stops being a scroll-start-target, the
+        // 2. if/when the grandchild stops being a scroll-initial-target, the
         //    child (inner container) is scrolled to.
         await waitForCompositorCommit();
         await resetDisplay();
         t.add_cleanup(async () => {
-          inner_container.style.scrollStartTarget = "none";
+          inner_container.style.scrollInitialTarget = "none";
           await waitForAnimationFrames(2);
         });
 
         assert_equals(outer_container.scrollTop, outer_to_target_scrolltop,
-          "outer-container is scrolled to scroll-start-target");
-        // Make the inner container a scroll-start-target.
-        inner_container.style.scrollStartTarget = "auto";
+          "outer-container is scrolled to scroll-initial-target");
+        // Make the inner container a scroll-initial-target.
+        inner_container.style.scrollInitialTarget = "nearest";
         await waitForAnimationFrames(2);
 
         // The inner container has overflow: visible, so it's not the scroll
@@ -174,33 +174,33 @@
         assert_equals(outer_container.scrollTop,
           outer_to_inner_scrolltop,
           "outer-container is scrolled to inner-container (which is before the" +
-          "inner scroll-start-target in tree order)");
-      }, "outer scroll-start-target takes precedence over inner");
+          "inner scroll-initial-target in tree order)");
+      }, "outer scroll-initial-target takes precedence over inner");
 
       promise_test(async (t) => {
         // This test verifies that a child which is a scroller, is a
-        // scroll-start-target, and has a scroll-start-target is scrolled to by
-        // its scrolling container, and also scrolls to its own
-        // scroll-start-target.
+        // scroll-initial-target, and has a scroll-initial-target is scrolled to
+        // by its scrolling container, and also scrolls to its own
+        // scroll-initial-target.
         await waitForCompositorCommit();
         await resetDisplay();
         t.add_cleanup(async () => {
           inner_container.style.overflow = "visible";
-          inner_container.style.scrollStartTarget = "none";
+          inner_container.style.scrollInitialTarget = "none";
           await waitForAnimationFrames(2);
         });
 
         assert_equals(outer_container.scrollTop, outer_to_target_scrolltop,
-          "outer-container is scrolled to scroll-start-target");
+          "outer-container is scrolled to scroll-initial-target");
 
-        // Make the inner container a scroll-start-target.
-        inner_container.style.scrollStartTarget = "auto";
+        // Make the inner container a scroll-initial-target.
+        inner_container.style.scrollInitialTarget = "nearest";
         await waitForAnimationFrames(2);
 
         assert_equals(outer_container.scrollTop,
           outer_to_inner_scrolltop,
           "outer-container is still scrolled to inner scroll-container" +
-          "as it is a scroll-start-target and comes before #target in " +
+          "as it is a scroll-initial-target and comes before #target in " +
           "tree-order");
 
         // Make the inner container a scroller.
@@ -213,7 +213,7 @@
         assert_equals(inner_container.scrollTop,
           inner_to_target_scrolltop,
           "inner-container is scrolled to target");
-      }, "scroll containers can also be scroll-start-targets");
+      }, "scroll containers can also be scroll-initial-targets");
     </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-root.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-root.tentative.html
similarity index 83%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-root.tentative.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-root.tentative.html
index 860a592bb10..5cb9e744733 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-root.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-root.tentative.html
@@ -3,8 +3,8 @@
 
 <head>
   <meta charset="utf-8">
-  <title> CSS Scroll Snap 2 Test: scroll-start-target*</title>
-  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start-target">
+  <title> CSS Scroll Snap 2 Test: scroll-initial-target*</title>
+  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
 </head>
@@ -32,7 +32,7 @@
       top: 60vh;
       left: 60vw;
       background-color: purple;
-      scroll-start-target: auto;
+      scroll-initial-target: nearest;
     }
 
     .bottom_right {
@@ -54,9 +54,9 @@
       const expected_scroll_left = top_left_box.getBoundingClientRect().width;
 
       assert_approx_equals(scroller.scrollTop, expected_scroll_top, 1,
-        "scroll-start-target sets initial vertical scroll position");
+        "scroll-initial-target sets initial vertical scroll position");
       assert_approx_equals(scroller.scrollLeft, expected_scroll_left, 1,
-        "scroll-start-target sets initial horizontal scroll position");
+        "scroll-initial-target sets initial horizontal scroll position");
     });
   </script>
 </body>
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-rtl.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-rtl.tentative.html
similarity index 78%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-rtl.tentative.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-rtl.tentative.html
index e7766cc07a2..7cb0f93c495 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-rtl.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-rtl.tentative.html
@@ -3,8 +3,8 @@
 
 <head>
   <meta charset="utf-8">
-  <title> CSS Scroll Snap 2 Test: scroll-start-target*</title>
-  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start-target">
+  <title> CSS Scroll Snap 2 Test: scroll-initial-target*</title>
+  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
 </head>
@@ -34,7 +34,7 @@
     .center {
       top: 60%;
       background-color: purple;
-      scroll-start-target: auto;
+      scroll-initial-target: nearest;
     }
 
     .bottom_left {
@@ -53,10 +53,10 @@
 
     test((t) => {
       assert_equals(scroller.scrollTop, initial_expected_scroll_top,
-          "scroller is vertically scrolled to scroll-start-target");
+          "scroller is vertically scrolled to scroll-initial-target");
       assert_equals(scroller.scrollLeft, initial_expected_scroll_left,
-          "scroller is horizontally scrolled to scroll-start-target");
-    }, "scroll-start-target reflects vertical rtl writing mode.");
+          "scroller is horizontally scrolled to scroll-initial-target");
+    }, "scroll-initial-target reflects vertical rtl writing mode.");
   </script>
 </body>
 
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-span.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-span.tentative.html
similarity index 80%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-span.tentative.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-span.tentative.html
index 0985dcc2ee9..e7fe0479089 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-span.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-span.tentative.html
@@ -2,8 +2,8 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title> CSS Scroll Snap 2 Test: scroll-start-target with a &lt;span> element</title>
-    <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start-target">
+    <title> CSS Scroll Snap 2 Test: scroll-initial-target with a &lt;span> element</title>
+    <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="/css/css-animations/support/testcommon.js"></script>
@@ -24,7 +24,7 @@
         background-color: turquoise;
       }
       .target {
-        scroll-start-target: auto;
+        scroll-initial-target: nearest;
       }
       .scroller {
         overflow: scroll;
@@ -46,8 +46,8 @@
         const target = document.getElementById("target");
 
         assert_equals(scroller.scrollTop, target.offsetTop,
-          "scroller is initially scrolled to it <span> scroll-start-target");
-      }, "<span> scroll-start-target is honored");
+          "scroller is initially scrolled to it <span> scroll-initial-target");
+      }, "<span> scroll-initial-target is honored");
     </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-anchor-navigation-inner-frame.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-anchor-navigation-inner-frame.html
similarity index 94%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-anchor-navigation-inner-frame.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-anchor-navigation-inner-frame.html
index de02dcf00f6..c363961add7 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-anchor-navigation-inner-frame.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-anchor-navigation-inner-frame.html
@@ -23,7 +23,7 @@
     #middle_box {
       width: 100px;
       height: 60vh;
-      scroll-start-target: auto;
+      scroll-initial-target: nearest;
       background-color: purple;
     }
     #bottom_box {
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-anchor-navigation.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-anchor-navigation.tentative.html
similarity index 81%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-anchor-navigation.tentative.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-anchor-navigation.tentative.html
index bc5b75f75f1..8c6d02a1c7d 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-anchor-navigation.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-anchor-navigation.tentative.html
@@ -3,8 +3,8 @@
 
 <head>
   <meta charset="utf-8">
-  <title> CSS Scroll Snap 2 Test: scroll-start-target interaction with anchor navigation</title>
-  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start-target">
+  <title> CSS Scroll Snap 2 Test: scroll-initial-target interaction with anchor navigation</title>
+  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="/resources/testdriver.js"></script>
@@ -15,7 +15,7 @@
 </head>
 
 <body>
-  <iframe id="frame" src="scroll-start-target-with-anchor-navigation-inner-frame.html" onload="runTest()"></iframe>
+  <iframe id="frame" src="scroll-initial-target-with-anchor-navigation-inner-frame.html" onload="runTest()"></iframe>
   <script>
     function runTest() {
       promise_test(async (t) => {
@@ -29,12 +29,12 @@
         // Expect scroll offset of 100px per scroll-start.
         const scroll_start_target_top = 0.6 * frame.contentWindow.innerHeight;
         assert_equals(scroller.scrollTop, scroll_start_target_top,
-          "scroll-start-target sets initial scroll offset");
+          "scroll-initial-target sets initial scroll offset");
 
         // Scroll away from start position.
         scroller.scrollTop = 200;
         assert_equals(scroller.scrollTop, 200,
-          "scrolled away from scroll-start-target");
+          "scrolled away from scroll-initial-target");
 
         anchor_target_link.click();
         await waitForHashchange(frame.contentWindow);
@@ -52,8 +52,8 @@
 
         assert_equals(scroller.scrollTop, 200,
           "scroller returns to previous scroll position, not " +
-          "scroll-start-target");
-      }, "scroll-start-target does not override anchor navigation.");
+          "scroll-initial-target");
+      }, "scroll-initial-target does not override anchor navigation.");
     }
   </script>
 </body>
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-hash-fragment-navigation-inner-frame.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-hash-fragment-navigation-inner-frame.html
similarity index 95%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-hash-fragment-navigation-inner-frame.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-hash-fragment-navigation-inner-frame.html
index 90629c4990f..1c81212e216 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-hash-fragment-navigation-inner-frame.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-hash-fragment-navigation-inner-frame.html
@@ -23,7 +23,7 @@
     #middle_box {
       width: 100px;
       height: 60vh;
-      scroll-start-target: auto;
+      scroll-initial-target: nearest;
       background-color: purple;
     }
     #bottom_box {
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-hash-fragment-navigation.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-hash-fragment-navigation.tentative.html
similarity index 70%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-hash-fragment-navigation.tentative.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-hash-fragment-navigation.tentative.html
index 2d291c2ef9f..80b3a0af9f1 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-hash-fragment-navigation.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-hash-fragment-navigation.tentative.html
@@ -3,14 +3,14 @@
 
 <head>
   <meta charset="utf-8">
-  <title> CSS Scroll Snap 2 Test: scroll-start-target interaction with fragment-navigation</title>
-  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start-target">
+  <title> CSS Scroll Snap 2 Test: scroll-initial-target interaction with fragment-navigation</title>
+  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
 </head>
 
 <body>
-  <iframe id="frame" src="scroll-start-target-with-fragment-navigation-inner-frame.html#fragment_target"
+  <iframe id="frame" src="scroll-initial-target-with-fragment-navigation-inner-frame.html#fragment_target"
     onload="runTest()"></iframe>
   <script>
     function runTest() {
@@ -18,9 +18,9 @@
         let scroller = frame.contentDocument.scrollingElement;
         // fragment_target is at the bottom of the frame so the frame should be
         // fully scrolled down to bring it into view (despite middle_box being
-        // the scroll-start-target).
+        // the scroll-initial-target).
         let expected_scroll_top = scroller.scrollHeight - scroller.clientHeight;
-        // The scroll-start-target is just below top_box which has a height of
+        // The scroll-initial-target is just below top_box which has a height of
         // 60vh.
         const scroll_start_target_top = 0.6 * frame.contentWindow.innerHeight;
 
@@ -28,7 +28,7 @@
         assert_not_equals(scroll_start_target_top, expected_scroll_top);
         assert_equals(frame.contentDocument.scrollingElement.scrollTop,
           expected_scroll_top);
-      }, "scroll-start-target does not override hash fragment navigation");
+      }, "scroll-initial-target does not override hash fragment navigation");
     }
   </script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-scroll-snap.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-scroll-snap.tentative.html
similarity index 87%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-scroll-snap.tentative.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-scroll-snap.tentative.html
index 28bea40d7a0..dfdb8b02772 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-scroll-snap.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-scroll-snap.tentative.html
@@ -3,8 +3,8 @@
 
 <head>
   <meta charset="utf-8">
-  <title> CSS Scroll Snap 2 Test: scroll-start-target*</title>
-  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start-target">
+  <title> CSS Scroll Snap 2 Test: scroll-initial-target*</title>
+  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
 </head>
@@ -42,7 +42,7 @@
       top: 200px;
       left: 200px;
       background-color: purple;
-      scroll-start-target: auto;
+      scroll-initial-target: nearest;
     }
 
     .bottom_right {
@@ -71,9 +71,9 @@
           centerbox.getBoundingClientRect().width;
 
       assert_approx_equals(scroller.scrollTop, expected_scroll_top, 1,
-        "scroll-start-target sets initial vertical scroll position");
+        "scroll-initial-target sets initial vertical scroll position");
       assert_approx_equals(scroller.scrollLeft, expected_scroll_left, 1,
-        "scroll-start-target sets initial horizontal scroll position");
+        "scroll-initial-target sets initial horizontal scroll position");
     });
   </script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-scroll-start-root.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-scroll-start-root.tentative.html
similarity index 83%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-scroll-start-root.tentative.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-scroll-start-root.tentative.html
index daf664aa7fb..2405334540f 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-scroll-start-root.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-scroll-start-root.tentative.html
@@ -3,8 +3,8 @@
 
 <head>
   <meta charset="utf-8">
-  <title> CSS Scroll Snap 2 Test: scroll-start-target*</title>
-  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start-target">
+  <title> CSS Scroll Snap 2 Test: scroll-initial-target*</title>
+  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
 </head>
@@ -36,7 +36,7 @@
       top: 60vh;
       left: 60vw;
       background-color: purple;
-      scroll-start-target: auto;
+      scroll-initial-target: nearest;
     }
 
     .bottom_right {
@@ -58,9 +58,9 @@
       const expected_scroll_left = top_left_box.getBoundingClientRect().width;
 
       assert_approx_equals(scroller.scrollTop, expected_scroll_top, 1,
-        "scroll-start-target sets initial vertical scroll position");
+        "scroll-initial-target sets initial vertical scroll position");
       assert_approx_equals(scroller.scrollLeft, expected_scroll_left, 1,
-        "scroll-start-target sets initial horizontal scroll position");
+        "scroll-initial-target sets initial horizontal scroll position");
     });
   </script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-scroll-start.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-scroll-start.tentative.html
similarity index 82%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-scroll-start.tentative.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-scroll-start.tentative.html
index a08daad76db..9c0f58ddbfb 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-scroll-start.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-scroll-start.tentative.html
@@ -3,8 +3,8 @@
 
 <head>
   <meta charset="utf-8">
-  <title> CSS Scroll Snap 2 Test: scroll-start-target*</title>
-  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start-target">
+  <title> CSS Scroll Snap 2 Test: scroll-initial-target*</title>
+  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
 </head>
@@ -24,7 +24,7 @@
       margin: 0px;
       position: absolute;
       scroll-start: end end;
-      /* This should be overriden by scroll-start-target. */
+      /* This should be overriden by scroll-initial-target. */
     }
 
     .box {
@@ -43,7 +43,7 @@
       top: 200px;
       left: 200px;
       background-color: purple;
-      scroll-start-target: auto;
+      scroll-initial-target: nearest;
     }
 
     .bottom_right {
@@ -67,9 +67,9 @@
       const expected_scroll_left = top_left_box.getBoundingClientRect().width;
 
       assert_approx_equals(scroller.scrollTop, expected_scroll_top, 1,
-        "scroll-start-target sets initial vertical scroll position");
+        "scroll-initial-target sets initial vertical scroll position");
       assert_approx_equals(scroller.scrollLeft, expected_scroll_left, 1,
-        "scroll-start-target sets initial horizontal scroll position");
+        "scroll-initial-target sets initial horizontal scroll position");
     });
   </script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-text-fragment-navigation-target.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-text-fragment-navigation-target.html
similarity index 93%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-text-fragment-navigation-target.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-text-fragment-navigation-target.html
index 80cbb55fb27..4cad10e0b3e 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-text-fragment-navigation-target.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-text-fragment-navigation-target.html
@@ -20,7 +20,7 @@
     #middle_box {
       width: 100px;
       height: 60vh;
-      scroll-start-target: auto;
+      scroll-initial-target: nearest;
       background-color: purple;
     }
     #bottom_box {
@@ -42,7 +42,7 @@
   <div id="fragment_target">Target</div>
   <script>
     function stashResult(key, results) {
-      fetch(`/css/css-scroll-snap-2/scroll-start-target/stash.py?key=${key}`, {
+      fetch(`/css/css-scroll-snap-2/scroll-initial-target/stash.py?key=${key}`, {
         method: "POST",
         body: JSON.stringify(results)
       }).then(() => {
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-text-fragment-navigation.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-text-fragment-navigation.tentative.html
similarity index 77%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-text-fragment-navigation.tentative.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-text-fragment-navigation.tentative.html
index f83ea1a036a..a83b36c2662 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-text-fragment-navigation.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-text-fragment-navigation.tentative.html
@@ -3,8 +3,8 @@
 
 <head>
   <meta charset="utf-8">
-  <title> CSS Scroll Snap 2 Test: scroll-start-target interaction with text-fragment navigation</title>
-  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start-target">
+  <title> CSS Scroll Snap 2 Test: scroll-initial-target interaction with text-fragment navigation</title>
+  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="/resources/testdriver.js"></script>
@@ -16,7 +16,7 @@
 <body onload="runTest()">
   <script>
     function fetchResult(key, resolve, reject) {
-      fetch(`/css/css-scroll-snap-2/scroll-start-target/stash.py?key=${key}`).then(response => {
+      fetch(`/css/css-scroll-snap-2/scroll-initial-target/stash.py?key=${key}`).then(response => {
         return response.text();
       }).then(text => {
         if (text) {
@@ -37,7 +37,7 @@
         let key = token();
 
         test_driver.bless("Open a URL with a text fragment directive", () => {
-          window.open(`scroll-start-target-with-text-fragment-navigation-target.html?key=${key}#:~:text=Target`, "_blank", "noopener");
+          window.open(`scroll-initial-target-with-text-fragment-navigation-target.html?key=${key}#:~:text=Target`, "_blank", "noopener");
         });
 
         fetchResult(key, resolve, reject);
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-user-programmatic-scroll.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-user-programmatic-scroll.tentative.html
similarity index 80%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-user-programmatic-scroll.tentative.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-user-programmatic-scroll.tentative.html
index 6bcf103253d..20d6763034f 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target-with-user-programmatic-scroll.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target-with-user-programmatic-scroll.tentative.html
@@ -3,8 +3,8 @@
 
 <head>
   <meta charset="utf-8">
-  <title> CSS Scroll Snap 2 Test: scroll-start-target*</title>
-  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start-target">
+  <title> CSS Scroll Snap 2 Test: scroll-initial-target*</title>
+  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="/resources/testdriver.js"></script>
@@ -45,7 +45,7 @@
       top: 200px;
       left: 200px;
       background-color: purple;
-      scroll-start-target: auto;
+      scroll-initial-target: nearest;
     }
 
     .bottom_right {
@@ -78,7 +78,7 @@
       scroller.scrollTo(target_offset.x, target_offset.y);
     }
 
-    async function test_scroll_start_target(test, scroller, msg, scrolling_function) {
+    async function test_scroll_initial_target(test, scroller, msg, scrolling_function) {
       await waitForCompositorCommit();
       let top_left_box = document.getElementById("user_top_left_box");
 
@@ -86,9 +86,9 @@
       let expected_scroll_left = top_left_box.getBoundingClientRect().width;
 
       assert_approx_equals(scroller.scrollTop, expected_scroll_top, 1,
-        "scroll-start-target sets initial vertical scroll position");
+        "scroll-initial-target sets initial vertical scroll position");
       assert_approx_equals(scroller.scrollLeft, expected_scroll_left, 1,
-        "scroll-start-target sets initial horizontal scroll position");
+        "scroll-initial-target sets initial horizontal scroll position");
 
       let scrollend_promise = new Promise((resolve) => {
         scroller.addEventListener("scrollend", resolve);
@@ -112,14 +112,15 @@
 
     promise_test(async (t) => {
       let scroller = document.getElementById("user_scroller");
-      const msg = "user scroll is not overriden in by scroll-start-target";
-      await test_scroll_start_target(t, scroller, msg, user_scroll);
-    }, "scroll-start-target does not override user scroll");
+      const msg = "user scroll is not overriden in by scroll-initial-target";
+      await test_scroll_initial_target(t, scroller, msg, user_scroll);
+    }, "scroll-initial-target does not override user scroll");
 
     promise_test(async (t) => {
       let scroller = document.getElementById("programmatic_scroller");
-      const msg = "programmatic scroll is not overriden in by scroll-start-target";
-      await test_scroll_start_target(t, scroller, msg, programmatic_scroll);
-    }, "scroll-start-target does not override programmatic scroll");
+      const msg =
+        "programmatic scroll is not overriden in by scroll-initial-target";
+      await test_scroll_initial_target(t, scroller, msg, programmatic_scroll);
+    }, "scroll-initial-target does not override programmatic scroll");
   </script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target.tentative.html b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target.tentative.html
similarity index 85%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target.tentative.html
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target.tentative.html
index 1fcb3cbbe40..13e9e20e3e2 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/scroll-start-target.tentative.html
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/scroll-initial-target.tentative.html
@@ -3,8 +3,8 @@
 
 <head>
   <meta charset="utf-8">
-  <title> CSS Scroll Snap 2 Test: scroll-start-target*</title>
-  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-start-target">
+  <title> CSS Scroll Snap 2 Test: scroll-initial-target*</title>
+  <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#scroll-initial-target">
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
 </head>
@@ -38,7 +38,7 @@
     }
 
     .target {
-      scroll-start-target: auto;
+      scroll-initial-target: nearest;
     }
 
     .center {
@@ -68,9 +68,9 @@
       const expected_scroll_left = top_left_box.getBoundingClientRect().width;
 
       assert_approx_equals(scroller.scrollTop, expected_scroll_top, 1,
-        "scroll-start-target sets initial vertical scroll position");
+        "scroll-initial-target sets initial vertical scroll position");
       assert_approx_equals(scroller.scrollLeft, expected_scroll_left, 1,
-        "scroll-start-target sets initial horizontal scroll position");
+        "scroll-initial-target sets initial horizontal scroll position");
     });
   </script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/stash.py b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/stash.py
similarity index 68%
rename from tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/stash.py
rename to tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/stash.py
index 3c65e2b59b3..1b1800d30ef 100644
--- a/tests/wpt/tests/css/css-scroll-snap-2/scroll-start-target/stash.py
+++ b/tests/wpt/tests/css/css-scroll-snap-2/scroll-initial-target/stash.py
@@ -3,11 +3,11 @@
 # found in the LICENSE file.
 """
 This file allows the different windows created by
-css/css-scroll-snap-2/scroll-start-target-with-text-fragment-navigation.html
+css/css-scroll-snap-2/scroll-initial-target-with-text-fragment-navigation.html
 to store and retrieve data.
 
-scroll-start-target-with-text-fragment-navigation.html (test file) opens a window to
-scroll-start-target-with-text-fragment-navigation-target.html which writes some data
+scroll-initial-target-with-text-fragment-navigation.html (test file) opens a window to
+scroll-initial-target-with-text-fragment-navigation-target.html which writes some data
 which the test file will eventually read. This file handles the requests from
 both windows.
 """
@@ -19,9 +19,9 @@ def main(request, response):
 
     if request.method == u"POST":
         # Received result data from target page
-        request.server.stash.put(key, request.body, u'/css/css-scroll-snap-2/scroll-start-target/')
+        request.server.stash.put(key, request.body, u'/css/css-scroll-snap-2/scroll-initial-target/')
         return u"ok"
     else:
         # Request for result data from test page
-        value = request.server.stash.take(key, u'/css/css-scroll-snap-2/scroll-start-target/')
+        value = request.server.stash.take(key, u'/css/css-scroll-snap-2/scroll-initial-target/')
         return value
diff --git a/tests/wpt/tests/css/css-sizing/abspos-auto-sizing-fit-content-percentage-001.html b/tests/wpt/tests/css/css-sizing/abspos-auto-sizing-fit-content-percentage-001.html
new file mode 100644
index 00000000000..b729e6ff7c5
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/abspos-auto-sizing-fit-content-percentage-001.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<link rel="author" title="David Shin" href="mailto:dshin@mozilla.com">
+<link rel="help" href="https://drafts.csswg.org/css-position-3/#abspos-auto-size">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1936450">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Ensures that abspos elements with fit-content sizing disallows percent-size resolution in its children.">
+<style>
+.container {
+  position: relative;
+  width: 100px;
+  height: 100px;
+  background: red;
+}
+
+.abs {
+  position: absolute;
+  background: green;
+}
+
+.child {
+  width: 100px;
+  height: 100px;
+  margin-left: -50%;
+}
+</style>
+<p>Test passes if there is a filled green square.</p>
+<div class="container">
+  <div class="abs">
+    <div class="child"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-sizing/abspos-auto-sizing-fit-content-percentage-002.html b/tests/wpt/tests/css/css-sizing/abspos-auto-sizing-fit-content-percentage-002.html
new file mode 100644
index 00000000000..856b9607fa2
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/abspos-auto-sizing-fit-content-percentage-002.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<link rel="author" title="David Shin" href="mailto:dshin@mozilla.com">
+<link rel="help" href="https://drafts.csswg.org/css-position-3/#abspos-auto-size">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1936450">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Ensures that abspos elements with fit-content sizing disallows percent-size resolution in its children.">
+<style>
+.container {
+  position: relative;
+  width: 100px;
+  height: 100px;
+  background: red;
+}
+
+.abs {
+  position: absolute;
+  background: green;
+}
+
+.child {
+  width: 100px;
+  height: 100px;
+  margin-right: -50%;
+}
+</style>
+<p>Test passes if there is a filled green square.</p>
+<div class="container">
+  <div class="abs">
+    <div class="child"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-sizing/abspos-auto-sizing-fit-content-percentage-003.html b/tests/wpt/tests/css/css-sizing/abspos-auto-sizing-fit-content-percentage-003.html
new file mode 100644
index 00000000000..b872ca162b3
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/abspos-auto-sizing-fit-content-percentage-003.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<link rel="author" title="David Shin" href="mailto:dshin@mozilla.com">
+<link rel="help" href="https://drafts.csswg.org/css-position-3/#abspos-auto-size">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1936450">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Ensures that abspos elements with fit-content sizing disallows percent-size resolution in its children.">
+<style>
+.container {
+  position: relative;
+  width: 100px;
+  height: 100px;
+  background: red;
+}
+
+.abs {
+  position: absolute;
+  background: green;
+}
+
+.child {
+  width: 100px;
+  height: 100px;
+  padding-left: 50%;
+}
+</style>
+<p>Test passes if there is a filled green square.</p>
+<div class="container">
+  <div class="abs">
+    <div class="child"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-sizing/abspos-auto-sizing-fit-content-percentage-004.html b/tests/wpt/tests/css/css-sizing/abspos-auto-sizing-fit-content-percentage-004.html
new file mode 100644
index 00000000000..1d05d96f431
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/abspos-auto-sizing-fit-content-percentage-004.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<link rel="author" title="David Shin" href="mailto:dshin@mozilla.com">
+<link rel="help" href="https://drafts.csswg.org/css-position-3/#abspos-auto-size">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1936450">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<meta name="assert" content="Ensures that abspos elements with fit-content sizing disallows percent-size resolution in its children.">
+<style>
+.container {
+  position: relative;
+  width: 100px;
+  height: 100px;
+  background: red;
+}
+
+.abs {
+  position: absolute;
+  background: green;
+}
+
+.child {
+  width: 100px;
+  height: 100px;
+  padding-right: 50%;
+}
+</style>
+<p>Test passes if there is a filled green square.</p>
+<div class="container">
+  <div class="abs">
+    <div class="child"></div>
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-sizing/stretch/block-height-1.html b/tests/wpt/tests/css/css-sizing/stretch/block-height-001.html
similarity index 100%
rename from tests/wpt/tests/css/css-sizing/stretch/block-height-1.html
rename to tests/wpt/tests/css/css-sizing/stretch/block-height-001.html
diff --git a/tests/wpt/tests/css/css-sizing/stretch/block-height-002.tentative.html b/tests/wpt/tests/css/css-sizing/stretch/block-height-002.tentative.html
new file mode 100644
index 00000000000..2b906985da1
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/stretch/block-height-002.tentative.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#example-174ae518">
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<script src="/resources/check-layout-th.js"></script>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<meta name="assert"
+  content="the stretch examples in the spec are rendered correctly">
+
+<style>
+  main {
+    font: 20px/1 Ahem;
+  }
+</style>
+<p>This test asserts the behavior seemingly agreed upon through
+  https://github.com/w3c/csswg-drafts/issues/11044#issuecomment-2486935794. This
+  is unlikely to be the final specified behavior, hence the test is marked
+  tentative.</p>
+
+<main>
+  <!-- Example 9
+[T]he outer height of the inner box will exactly match the height of the outer box (200px), but its inner height will be 20px less, to account for its margins.
+-->
+<div style="height: 200px; border: solid;">
+  <div style="height: stretch; margin: 10px;" data-expected-height="180"></div>
+</div>
+
+<!-- Example 9, second case
+In the following case, the height of the inner box will exactly match the height of the outer box (200px).
+-->
+<div style="height: 200px; margin: 0;">
+  <div style="height: stretch; margin: 10px;" data-expected-height="200"></div>
+</div>
+
+<!-- Example 10
+Similarly, width: stretch causes the box to fill its container, being 20px narrower than the width of "some more text" (due to the 10px margin)
+-->
+<div style="float: left; margin: 0; outline: solid;">
+  <div style="width: stretch; margin: 10px; background: skyblue;"
+    data-expected-width="260">
+    text
+  </div>
+  <span>some more text</span>
+</div>
+
+<div style="clear: both;"></div>
+
+<!-- Example 11
+On the other hand, in this example the container’s height is indefinite, which would cause a percentage height on the child to behave as auto, so height: stretch behaves as auto as well.
+-->
+<div style="height: auto; margin: 0; background: orange;">
+  lorem ipsum<br>
+  cats
+  <div style="height: stretch; margin: 10px; background: lime;"
+    data-expected-height="20">dogs</div>
+</div>
+
+</main>
+
+<script>
+  document.fonts.ready.then(() => checkLayout("main > div > div"));
+</script>
diff --git a/tests/wpt/tests/css/css-sizing/stretch/block-height-003-ref.html b/tests/wpt/tests/css/css-sizing/stretch/block-height-003-ref.html
new file mode 100644
index 00000000000..76e2bc35cb7
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/stretch/block-height-003-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+
+<style>
+  .surrounding-block {
+    width: 100px;
+    height: 100px;
+    border: solid;
+  }
+</style>
+
+<div class="surrounding-block"></div>
+<div style="height: 75px;"></div>
+<div
+  style="width: 200px; height: 200px; outline: 1px solid; border: 2px dashed blue; box-sizing: border-box;">
+</div>
+<div class="surrounding-block"></div>
diff --git a/tests/wpt/tests/css/css-sizing/stretch/block-height-003.tentative.html b/tests/wpt/tests/css/css-sizing/stretch/block-height-003.tentative.html
new file mode 100644
index 00000000000..a469f8d5df2
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/stretch/block-height-003.tentative.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<link rel="help"
+  href="https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing">
+<meta name="assert"
+  content="Both margins are ignored for sizing, but top margin still collapses. Bottom margin doesn't collapse because parent has a definite height.">
+<link rel="match" href="block-height-003-ref.html">
+
+<style>
+  .surrounding-block {
+    width: 100px;
+    height: 100px;
+    border: solid;
+  }
+</style>
+
+<!--
+<p>This test asserts the behavior seemingly agreed upon through
+  https://github.com/w3c/csswg-drafts/issues/11044#issuecomment-2486935794. This
+  is unlikely to be the final specified behavior, hence the test is marked
+  tentative.</p>
+-->
+
+<div class="surrounding-block"></div>
+<div style="width: 200px; height: 200px; outline: 1px solid;">
+  <div
+    style="height: stretch; margin: 75px 0px 25px 0px; border: 2px dashed blue;">
+  </div>
+</div>
+<div class="surrounding-block"></div>
diff --git a/tests/wpt/tests/css/css-sizing/stretch/block-height-004.tentative.html b/tests/wpt/tests/css/css-sizing/stretch/block-height-004.tentative.html
new file mode 100644
index 00000000000..1aa12ca0dcc
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/stretch/block-height-004.tentative.html
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<link rel="help"
+  href="https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11044">
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<script src="/resources/check-layout-th.js"></script>
+<meta name="assert"
+  content="demonstrate the behavior described in https://github.com/w3c/csswg-drafts/issues/11044#issuecomment-2422165458">
+
+<style>
+  .outer {
+    width: 100px;
+    height: 100px;
+    outline: solid;
+    position: relative;
+  }
+
+  .inner {
+    height: stretch;
+    margin: 10px;
+  }
+
+  p {
+    margin-top: 20px;
+    margin-bottom: 0px;
+  }
+</style>
+
+<p>This test asserts the behavior seemingly agreed upon through
+  https://github.com/w3c/csswg-drafts/issues/11044#issuecomment-2486935794. This
+  is unlikely to be the final specified behavior, hence the test is marked
+  tentative.</p>
+
+<p>Basic case: treat margins as 0.</p>
+<div class="outer">
+  <div class="inner" style="border: solid magenta;" data-expected-height="100"
+    data-offset-y="0">
+  </div>
+</div>
+
+<p>
+  When resolving stretch, don't treat margins as 0 if there is a sibling on that
+  side. (Hand-wavy: we don't collapse margins through siblings for the purpose
+  of resolving stretched heights.)</p>
+<p>
+  Then when actually doing margin collapsing, .inner's margins DON'T collapse
+  with .outer's because of the usual rule that margins don't collapse through
+  new formatting contexts.
+</p>
+<div class="outer">
+  <div style="overflow: hidden"></div>
+  <div class="inner" style="border: solid cyan;" data-expected-height="80"
+    data-offset-y="10">
+  </div>
+  <div style="overflow: hidden"></div>
+</div>
+
+<p>When resolving stretch, don't treat margins as 0 if there is a sibling on
+  that side. (Hand-wavy: we don't collapse margins through siblings for the
+  purpose of resolving stretched heights.)</p>
+<p>
+  Then when actually doing margin collapsing, .inner's margins DO collapse with
+  .outer's because they collapse through the empty siblings.
+</p>
+<div class="outer">
+  <div></div>
+  <div class="inner" style="border: solid blue;" data-expected-height="80"
+    data-offset-y="0">
+  </div>
+  <div></div>
+</div>
+
+<p>Only treat the BOTTOM margin as 0. Margins do collapse, so top edges touch.
+</p>
+<div class="outer">
+  <div></div>
+  <div class="inner" style="border: solid purple;" data-expected-height="90"
+    data-offset-y="0">
+  </div>
+</div>
+
+<p>Only treat the TOP margin as 0. Margins do collapse, so top edges touch.</p>
+<div class="outer">
+  <div class="inner" style="border: solid lime;" data-expected-height="90"
+    data-offset-y="0">
+  </div>
+  <div></div>
+</div>
+
+<p>Account for the margins when parent establishes a BFC.</p>
+<div class="outer" style="display: flow-root;">
+  <div class="inner" style="border: solid orange;" data-expected-height="80"
+    data-offset-y="10">
+  </div>
+  <div></div>
+</div>
+
+<script>checkLayout(".inner");</script>
diff --git a/tests/wpt/tests/css/css-sizing/stretch/block-height-005.tentative.html b/tests/wpt/tests/css/css-sizing/stretch/block-height-005.tentative.html
new file mode 100644
index 00000000000..28756c339f3
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/stretch/block-height-005.tentative.html
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<link rel="help"
+  href="https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11044">
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<script src="/resources/check-layout-th.js"></script>
+<meta name="assert"
+  content="preceding floats don't prevent margin adjoiningness for stretch sizing purposes">
+
+<style>
+  .outer {
+    width: 100px;
+    height: 100px;
+    outline: solid;
+    position: relative;
+  }
+
+  .float {
+    float: left;
+    width: 30px;
+    height: 30px;
+    background: skyblue;
+  }
+
+  p {
+    margin-top: 20px;
+    margin-bottom: 0px;
+  }
+</style>
+
+<p>This test asserts the behavior seemingly agreed upon through
+  https://github.com/w3c/csswg-drafts/issues/11044#issuecomment-2486935794. This
+  is unlikely to be the final specified behavior, hence the test is marked
+  tentative.</p>
+
+<p>New BFC fits next to float, so top margins will collapse, so we want the
+  stretched height to match .outer's height.</p>
+<div class="outer">
+  <div class="float"></div>
+  <div
+    style="height: stretch; width: 30px; margin-top: 50px; display: flow-root; border: solid magenta;"
+    data-expected-height="100" data-offset-y="0">
+  </div>
+</div>
+
+<p>New BFC does not fit next to float, so margins DON'T collapse, but for
+  simplicity we still ignore margins when stretch sizing</p>
+<div class="outer">
+  <div class="float"></div>
+  <div
+    style="height: stretch; width: 90px; margin-top: 50px; display: flow-root; border: solid cyan;"
+    data-expected-height="100" data-offset-y="30">
+  </div>
+</div>
+
+<p>In-flow child overlaps the float, so margins DO collapse, so we want the
+  stretched height to match .outer's height.</p>
+<div class="outer">
+  <div class="float"></div>
+  <div
+    style="height: stretch; width: 90px; margin-top: 50px; border: solid green;"
+    data-expected-height="100" data-offset-y="0">
+  </div>
+</div>
+
+<p>In-flow child clears the float, so margins DON'T collapse, but for
+  simplicity we still ignore margins when stretch sizing</p>
+<div class="outer">
+  <div class="float"></div>
+  <div
+    style="height: stretch; width: 90px; clear: both; margin-top: 50px; border: solid orange;"
+    data-expected-height="100" data-offset-y="30">
+  </div>
+</div>
+
+<script>checkLayout(".float + div")</script>
diff --git a/tests/wpt/tests/css/css-sizing/stretch/block-height-006.tentative.html b/tests/wpt/tests/css/css-sizing/stretch/block-height-006.tentative.html
new file mode 100644
index 00000000000..a25c415b87f
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/stretch/block-height-006.tentative.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<link rel="help"
+  href="https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11044">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<meta name="assert"
+  content="Bottom margin is treated as 0 for stretch sizing even if there is a proceeding float">
+
+<style>
+  #reference-overlapped-red {
+    position: absolute;
+    background-color: red;
+    width: 100px;
+    height: 100px;
+    z-index: -1;
+  }
+</style>
+
+<!--
+<p>This test asserts the behavior seemingly agreed upon through
+  https://github.com/w3c/csswg-drafts/issues/11044#issuecomment-2486935794. This
+  is unlikely to be the final specified behavior, hence the test is marked
+  tentative.</p>
+  -->
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.
+</p>
+<div id="reference-overlapped-red"></div>
+
+<div style="height: 100px;">
+  <div
+    style="display: flow-root; width: 100px; height: stretch; margin-bottom: 50px; background: green;">
+  </div>
+  <div style="float: left; width: 50px; height: 50px;">
+  </div>
+</div>
diff --git a/tests/wpt/tests/css/css-sizing/stretch/block-height-2.html b/tests/wpt/tests/css/css-sizing/stretch/block-height-2.html
deleted file mode 100644
index 7028adf9054..00000000000
--- a/tests/wpt/tests/css/css-sizing/stretch/block-height-2.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<link rel="help" href="https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing">
-<script src='/resources/testharness.js'></script>
-<script src='/resources/testharnessreport.js'></script>
-<script src="/resources/check-layout-th.js"></script>
-<meta name="assert" content="Checks the behaviour of stretch in various configurations.">
-
-<body onload="checkLayout('[data-expected-height]')">
-
-<div style="height: 200px; border: solid;">
-  <div style="height: stretch; margin: 10px;" data-expected-height="180"></div>
-</div>
-
-<!--
-
-Chrome fails the following test, which is a variation of example 9 in the spec. Safari passes.
-
-From https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing, height:stretch for blocks behaves as
-"""
-100% but applying the resulting size to its margin box instead of the box indicated by box-sizing. For this purpose, auto margins are treated as zero, and furthermore, for block-level boxes in particular, if its block-start/block-end margin would be adjoining to its parent’s block-start/block-end margin if its parent’s sizing properties all had their initial values, then ***its block-start/block-end margin is treated as zero.***
-"""
-
-So the spec demands that the child has 0px margins and as a corollary, has 300px inner and outer height.
-
-But Blink gives it an inner height of 200px and margins as specified (25px/75px).
--->
-<div style="height: 300px; outline: 1px solid; margin: 10px 0px 10px 0px;">
-  <div
-    style="height: stretch; margin: 25px 0px 75px 0px; outline: 2px dashed blue;"
-    data-expected-height="300"></div>
-</div>
diff --git a/tests/wpt/tests/css/css-sizing/stretch/content-contribution-001.html b/tests/wpt/tests/css/css-sizing/stretch/content-contribution-001.html
new file mode 100644
index 00000000000..5f3706953c9
--- /dev/null
+++ b/tests/wpt/tests/css/css-sizing/stretch/content-contribution-001.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<link rel="help"
+  href="https://drafts.csswg.org/css-sizing-4/#stretch-fit-sizing">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/11006">
+<script src='/resources/testharness.js'></script>
+<script src='/resources/testharnessreport.js'></script>
+<script src="/resources/check-layout-th.js"></script>
+<meta name="assert"
+  content="stretched children contribute their automatic size to parent's min/max content sizes">
+
+<style>
+  .test {
+    outline: solid;
+    margin-bottom: 10px;
+  }
+</style>
+
+<div style="width: max-content;" class="test" data-expected-client-width="100">
+  <div style="float: left; width: 100px; height: 100px;"></div>
+  <div style="float: left; width: stretch; outline: solid blue;"></div>
+</div>
+
+<div style="width: max-content;" class="test" data-expected-client-width="120">
+  <div style="float: left; width: 100px; height: 100px;"></div>
+  <div style="float: left; width: stretch; outline: solid blue;">
+    <div style="width: 20px; height: 20px;"></div>
+  </div>
+</div>
+
+<div style="width: 100px; height: max-content;" class="test"
+  data-expected-client-height="100">
+  <div style="width: 100px; height: 100px;"></div>
+  <div style="height: stretch; outline: solid blue;"></div>
+</div>
+
+<div style="width: 100px; height: max-content;" class="test"
+  data-expected-client-height="120">
+  <div style="width: 100px; height: 100px;"></div>
+  <div style="height: stretch; outline: solid blue;">
+    <div style="width: 20px; height: 20px;"></div>
+  </div>
+</div>
+
+<div style="writing-mode: vertical-lr;">
+  <div style="inline-size: stretch; block-size: 100px;" class="test"
+    data-expected-client-height="0"></div>
+</div>
+
+<div style="writing-mode: vertical-lr;">
+  <div style="inline-size: stretch; block-size: 100px; border: solid"
+    data-expected-client-height="20">
+    <div style="height: 20px;"></div>
+  </div>
+</div>
+
+<script>
+  checkLayout('.test');
+</script>
diff --git a/tests/wpt/tests/css/css-view-transitions/empty-render-target-crash.html b/tests/wpt/tests/css/css-view-transitions/empty-render-target-crash.html
new file mode 100644
index 00000000000..38c32b1efb8
--- /dev/null
+++ b/tests/wpt/tests/css/css-view-transitions/empty-render-target-crash.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<title>We shouldn't crash if the composited parents are empty</title>
+<link rel="help" href="https://drafts.csswg.org/css-view-transitions-1">
+<link rel="author" href="mailto:vmpstr@chromium.org">
+
+<body style="offset-path: ray(45deg closest-side contain);xborder-top: 1px solid black;inset-inline-start: 0;align-content: space-evenly flex-start safe;-webkit-mask-image: linear-gradient(white, white);border-inline-start-style: solid;flex-grow: 1.5;border-top-color: black;border-left-color: #000;-webkit-margin-start: 4px;-webkit-margin-before: 1px;offset-position: 30px 10px;-webkit-border-vertical-spacing: 10px;empty-cells: hide;scroll-padding-bottom: 12px;-webkit-clip-path: polygon(nonzero, 10px 75px, 180px 180px, 100px 10px, 10px 180px, 180px 75px, 10px 75px)"> { ;  false;</script><iframe srcdoc="
+"></iframe>
+<script>
+  onload = runTest;
+  async function startTransition(document, oldColor) {
+    await document.startViewTransition(() => {
+    }).ready;
+  }
+  async function runTest() {
+    const iframeDocument = document.querySelector("iframe").contentDocument;
+    await startTransition(iframeDocument, "blue");
+    await startTransition(document);
+  }
+</script>
diff --git a/tests/wpt/tests/css/css-view-transitions/navigation/at-rule-opt-in-change-with-script.html b/tests/wpt/tests/css/css-view-transitions/navigation/at-rule-opt-in-change-with-script.html
index 12452f67634..c06f28ce1de 100644
--- a/tests/wpt/tests/css/css-view-transitions/navigation/at-rule-opt-in-change-with-script.html
+++ b/tests/wpt/tests/css/css-view-transitions/navigation/at-rule-opt-in-change-with-script.html
@@ -14,22 +14,33 @@ function optIn() {
   document.querySelector("#vt-style").innerHTML = `@view-transition { navigation: auto }`;
 }
 const params = new URLSearchParams(location.search);
-const is_new_page = params.has('new');
 
-if (!is_new_page) {
-  onload = () => requestAnimationFrame(() => requestAnimationFrame(() => {
-      optIn();
-      location.replace(location.href + '?new');
-  }));
-} else {
-  promise_test(() => {
-    optIn();
-    return new Promise((resolve) => {
-        addEventListener('pagereveal', resolve);
-    }).then(event => {
-        assert_not_equals(event.viewTransition, null,
-            "ViewTransition must be triggered.");
+optIn();
+
+// This file includes 3 modes: test, old, new.
+// "test" is where testharness runs. "old" -> "new" is where the view transition takes place.
+switch (params.get("mode") || "test") {
+case "test":
+  promise_test(async t => {
+    const event = await new Promise(resolve => {
+      window.did_reveal = e => { resolve(e) };
+      const popup = window.open("?mode=old");
+      t.add_cleanup(() => popup.close());
     });
+
+    assert_not_equals(event.viewTransition, null, "ViewTransition must be triggered.");
   });
+  break;
+case "old":
+  onload = () => requestAnimationFrame(() => requestAnimationFrame(() => {
+      location.replace('?mode=new');
+  }));
+  break;
+case "new":
+  onpagereveal =  e => window.opener.did_reveal(e);
 }
 </script>
+
+<body>
+  Lorem ipsum dolor sit amet consectetur adipisicing elit. Alias quis assumenda doloremque, repellat quidem quia blanditiis harum animi corrupti totam sunt provident sapiente at eius sequi labore repellendus velit fugit!
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/css/css-view-transitions/navigation/chromium-paint-holding-timeout.html b/tests/wpt/tests/css/css-view-transitions/navigation/chromium-paint-holding-timeout.html
index 83596940fa4..cb3984695fd 100644
--- a/tests/wpt/tests/css/css-view-transitions/navigation/chromium-paint-holding-timeout.html
+++ b/tests/wpt/tests/css/css-view-transitions/navigation/chromium-paint-holding-timeout.html
@@ -6,6 +6,7 @@
 <link rel="match" href="chromium-paint-holding-timeout-ref.html">
 <link rel="assert" content="Ensures paint holding timeout cancels transition. Note that this is a Chromium only test">
 <script src="/common/reftest-wait.js"></script>
+<script src="/web-animations/testcommon.js"></script>
 <style>
 @view-transition {
   navigation: auto;
@@ -24,6 +25,9 @@ function runTest() {
   const url = "resources/chromium-paint-holding-timeout.html";
   window.location.replace(new URL(url, window.location));
 }
-onload = () => requestAnimationFrame(() => requestAnimationFrame(runTest));
+onload = async () => {
+  await waitForCompositorReady();
+  runTest();
+}
 </script>
 </html>
diff --git a/tests/wpt/tests/css/cssom-view/scrollWidthHeight-contain-layout.html b/tests/wpt/tests/css/cssom-view/scrollWidthHeight-contain-layout.html
index 1afab088506..f787f1a156f 100644
--- a/tests/wpt/tests/css/cssom-view/scrollWidthHeight-contain-layout.html
+++ b/tests/wpt/tests/css/cssom-view/scrollWidthHeight-contain-layout.html
@@ -25,7 +25,7 @@ let target = document.getElementById("target");
 for (let overflow of ["hidden", "auto", "scroll", "clip"]) {
   for (let padding of ["0", "2px"]) {
     for (let border of ["0", "3px solid"]) {
-      for (let display of ["flex", "block", "inline-block", "inline-flex", "grid", "inline-grid", "inline"]) {
+      for (let display of ["flex", "block", "flow-root", "inline-block", "inline-flex", "grid", "inline-grid", "inline"]) {
         test(function() {
           target.style.display = display;
           target.style.border = border;
diff --git a/tests/wpt/tests/css/cssom-view/scrollWidthHeight-negative-margin-002.html b/tests/wpt/tests/css/cssom-view/scrollWidthHeight-negative-margin-002.html
index 418b631f4ba..1192680c035 100644
--- a/tests/wpt/tests/css/cssom-view/scrollWidthHeight-negative-margin-002.html
+++ b/tests/wpt/tests/css/cssom-view/scrollWidthHeight-negative-margin-002.html
@@ -39,7 +39,7 @@ const paddingBox = {
   width: contentBox.width + 4 + 16,
   height: contentBox.height + 1 + 8,
 };
-for (let display of ["block", "flex", "grid"]) {
+for (let display of ["flow-root", "flex", "grid"]) {
   for (let flexDirection of ["row", "row-reverse", "column", "column-reverse"]) {
     if (flexDirection != "row" && display != "flex") {
       // Don't bother retesting with all flexDirection values unless we're actually a flex container
diff --git a/tests/wpt/tests/css/cssom-view/scrollWidthHeight-overflow-visible-margin-collapsing.html b/tests/wpt/tests/css/cssom-view/scrollWidthHeight-overflow-visible-margin-collapsing.html
new file mode 100644
index 00000000000..322c91afc08
--- /dev/null
+++ b/tests/wpt/tests/css/cssom-view/scrollWidthHeight-overflow-visible-margin-collapsing.html
@@ -0,0 +1,51 @@
+<!doctype html>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-scrollwidth">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-scrollheight">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1936156">
+<title>scroll{Width,Height} shouldn't account for collapsed margins, in order not to report unnecessary overflow</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #target div {
+    height: 20px;
+    min-width: 20px;
+    background-color: green;
+    margin: 20px 10px;
+  }
+</style>
+<div id="target">
+  <div>
+    <div></div>
+  </div>
+  <div></div>
+  <div></div>
+  <div></div>
+</div>
+<script>
+let target = document.getElementById("target");
+// "clip" is not really scrollable, but should match as well.
+for (let overflow of ["visible", "hidden", "auto", "scroll", "clip"]) {
+  for (let padding of ["0", "2px"]) {
+    for (let border of ["0", "3px solid"]) {
+      for (let display of ["flex", "block", "flow-root", "inline-block", "inline-flex", "grid", "inline-grid"]) {
+        test(function() {
+          target.style.overflow = overflow;
+          target.style.display = display;
+          target.style.border = border;
+          target.style.padding = padding;
+          let sh = target.scrollHeight;
+          let sw = target.scrollWidth;
+          let ch = target.clientHeight;
+          let cw = target.clientWidth;
+          assert_equals(sh, ch, "scrollHeight should match clientHeight, since there's no overflow");
+          assert_equals(sw, cw, "scrollWidth should match clientWidth, since there's no overflow");
+        }, `scroll{Width,Height} with margins should match client{Width,Height} if there would be no overflow width overflow: ${overflow}, padding: ${padding}, border: ${border}, display: ${display}`);
+      }
+    }
+  }
+}
+</script>
diff --git a/tests/wpt/tests/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht b/tests/wpt/tests/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht
index 8eb08d55203..463d31772eb 100644
--- a/tests/wpt/tests/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht
+++ b/tests/wpt/tests/css/cssom-view/scrollWidthHeightWhenNotScrollable.xht
@@ -79,7 +79,7 @@
 
             test(function(){
                 assert_equals(elemOverflow.scrollHeight, 200);
-            }, "elemOverflow.scrollHeight is the height of its scrolled contents (ignoring padding, since we overflowed)");
+            }, "elemOverflow.scrollHeight is the height of its scrolled contents (plus padding, since we overflowed)");
 
             test(function(){
                 assert_equals(elemOverflow.clientWidth, 240);
diff --git a/tests/wpt/tests/css/cssom/serialize-values.html b/tests/wpt/tests/css/cssom/serialize-values.html
index 2d20f263f4f..539052afaff 100644
--- a/tests/wpt/tests/css/cssom/serialize-values.html
+++ b/tests/wpt/tests/css/cssom/serialize-values.html
@@ -106,7 +106,7 @@
     function attr_fallback() {
       var values = ['attr(foo-bar, "fallback")', 'attr(foo_bar, "fallback")',
                     {actual: 'attr(|bar, "fallback")', serialized: 'attr(bar, "fallback")'},
-                    {actual: 'attr(foo, "")', serialized: 'attr(foo)'},
+                    {actual: 'attr(foo, "")', serialized: 'attr(foo, "")'},
                     {actual: 'attr( |foo ,  "" )', serialized: 'attr(foo)'}];
       return iterable(values);
     }
diff --git a/tests/wpt/tests/css/filter-effects/fecolormatrix-negative-ref.html b/tests/wpt/tests/css/filter-effects/fecolormatrix-negative-ref.html
new file mode 100644
index 00000000000..95a0051c18a
--- /dev/null
+++ b/tests/wpt/tests/css/filter-effects/fecolormatrix-negative-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Filter Effects: Test feColorMatrix with negative matrix entries</title>
+    <link rel="author" title="Toby Cathcart Burn" href="mailto:tcathcartburn@gmail.com">
+</head>
+
+<body>
+
+    <p>You should see a cyan colored rectangle.</p>
+
+    <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'>
+        <rect x='0' y='0' width='100' height='100' fill="#00ffff"></rect>
+    </svg>
+
+</body>
+
+</html>
diff --git a/tests/wpt/tests/css/filter-effects/fecolormatrix-negative.html b/tests/wpt/tests/css/filter-effects/fecolormatrix-negative.html
new file mode 100644
index 00000000000..eddec862154
--- /dev/null
+++ b/tests/wpt/tests/css/filter-effects/fecolormatrix-negative.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Filter Effects: Test feColorMatrix with negative matrix entries</title>
+    <link rel="author" title="Toby Cathcart Burn" href="mailto:tcathcartburn@gmail.com">
+    <link rel="help" href="http://www.w3.org/TR/filter-effects-1/#feColorMatrixElement">
+    <link rel="help" href="http://www.w3.org/TR/filter-effects-1/#element-attrdef-fecolormatrix-type">
+    <link rel="match" href="fecolormatrix-negative-ref.html">
+    <meta name="assert" content="If the test runs, you should see a cyan(#00ffff) colored rectangle.">
+</head>
+
+<body>
+
+    <p>You should see a cyan colored rectangle.</p>
+
+    <svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'>
+        <defs>
+            <filter id='invert' color-interpolation-filters='sRGB'>
+                <feColorMatrix in='SourceGraphic'
+                values='-1 0 0 0 1
+                        0 -1 0 0 1
+                        0 0 -1 0 1
+                        0 0 0 1 0' result='ef0'>
+                </feColorMatrix>
+                <feComposite in='ef0' in2='ef0' operator='arithmetic' k2='255'>
+                </feComposite>
+            </filter>
+        </defs>
+
+        <rect x='0' y='0' width='100' height='100' fill="#ffaa00" filter="url(#invert)"></rect>
+    </svg>
+
+</body>
+
+</html>
diff --git a/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-importNode.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-importNode.tentative.html
new file mode 100644
index 00000000000..dc5ef24bd80
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-importNode.tentative.html
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests ShadowRoot.importNode APIs work with scoped custom element registries</title>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<link rel="help" href="https://wicg.github.io/webcomponents/proposals/Scoped-Custom-Element-Registries">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+function createConnectedShadowTree(test, registry) {
+    const host = document.createElement('div');
+    const shadowRoot = host.attachShadow({mode: 'closed', registry});
+    document.body.appendChild(host);
+    test.add_cleanup(() => host.remove());
+    return shadowRoot;
+}
+
+test((test) => {
+    const registry = new CustomElementRegistry;
+    class SomeElement extends HTMLElement { };
+    registry.define('some-element', SomeElement);
+    const shadowRoot = createConnectedShadowTree(test, registry);
+    assert_true(shadowRoot.createElement('some-element') instanceof SomeElement);
+
+    const someElement = document.createElement('some-element');
+    assert_false(someElement instanceof SomeElement);
+    const clone = shadowRoot.importNode(someElement);
+    assert_true(clone instanceof SomeElement);
+}, 'ShadowRoot.importNode: an upgrade candidate from document');
+
+test((test) => {
+    const registry1 = new CustomElementRegistry;
+    class SomeElement1 extends HTMLElement { };
+    registry1.define('some-element', SomeElement1);
+    const shadowRoot1 = createConnectedShadowTree(test, registry1);
+    const someElement = shadowRoot1.createElement('some-element');
+    assert_true(someElement instanceof SomeElement1);
+
+    const registry2 = new CustomElementRegistry;
+    const shadowRoot2 = createConnectedShadowTree(test, registry2);
+    class SomeElement2 extends HTMLElement { }
+    registry2.define('some-element', SomeElement2);
+    assert_true(shadowRoot2.createElement('some-element') instanceof SomeElement2);
+
+    assert_true(shadowRoot2.importNode(someElement) instanceof SomeElement2);
+}, 'ShadowRoot.importNode: a custom element from another shadow tree');
+
+test((test) => {
+    const registry = new CustomElementRegistry;
+    const logs = [];
+    class SomeElement extends HTMLElement {
+        constructor() {
+            super();
+            logs.push('some-element');
+        }
+    };
+    class OtherElement extends HTMLElement {
+        constructor() {
+            super();
+            logs.push('other-element');
+        }
+    };
+    registry.define('some-element', SomeElement);
+    registry.define('other-element', OtherElement);
+
+    const template = document.createElement('template');
+    template.innerHTML = '<div><some-element>hello</some-element><other-element>world</other-element></div>';
+    assert_false(template.content.querySelector('some-element') instanceof SomeElement);
+    assert_false(template.content.querySelector('other-element') instanceof OtherElement);
+
+    const shadowRoot = createConnectedShadowTree(test, registry);
+    const clone = shadowRoot.importNode(template.content, /* deep */ true);
+    assert_true(clone.querySelector('some-element') instanceof SomeElement);
+    assert_true(clone.querySelector('other-element') instanceof OtherElement);
+    assert_array_equals(logs, ['some-element', 'other-element']);
+}, 'ShadowRoot.importNode: a template content from document');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-innerHTML.tentative.html b/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-innerHTML.tentative.html
new file mode 100644
index 00000000000..bee3f18a96d
--- /dev/null
+++ b/tests/wpt/tests/custom-elements/scoped-registry/ShadowRoot-innerHTML.tentative.html
@@ -0,0 +1,107 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Tests innerHTML should use the scoped custom element registry used to create the context object</title>
+<meta name="author" title="Ryosuke Niwa" href="mailto:rniwa@webkit.org">
+<link rel="help" href="https://github.com/WICG/webcomponents/issues/1078">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+function createConnectedShadowTree(test, registry) {
+    const host = document.createElement('div');
+    const shadowRoot = host.attachShadow({mode: 'closed', registry});
+    document.body.appendChild(host);
+    test.add_cleanup(() => host.remove());
+    return shadowRoot;
+}
+
+test((test) => {
+    const registry = new CustomElementRegistry;
+
+    class SomeElement extends HTMLElement { };
+    registry.define('some-element', SomeElement);
+
+    class OtherElement extends HTMLElement { };
+    registry.define('other-element', OtherElement);
+
+    const shadowRoot = createConnectedShadowTree(test, registry);
+    assert_true(shadowRoot.createElement('some-element') instanceof SomeElement);
+    assert_true(shadowRoot.createElement('other-element') instanceof OtherElement);
+    shadowRoot.innerHTML = '<some-element></some-element><other-element></other-element>';
+
+    assert_true(shadowRoot.querySelector('some-element') instanceof SomeElement);
+    assert_true(shadowRoot.querySelector('other-element') instanceof OtherElement);
+}, 'innerHTML on a shadow root should use scoped custom element registry');
+
+test((test) => {
+    const registry = new CustomElementRegistry;
+
+    class SomeElement extends HTMLElement { };
+    registry.define('some-element', SomeElement);
+
+    class OtherElement extends HTMLElement { };
+    registry.define('other-element', OtherElement);
+
+    const shadowRoot = createConnectedShadowTree(test, registry);
+    const someElement = shadowRoot.createElement('some-element');
+    assert_true(someElement instanceof SomeElement);
+    someElement.innerHTML = '<other-element></other-element>';
+    assert_true(someElement.querySelector('other-element') instanceof OtherElement);
+}, 'innerHTML on a disconnected element should use the associated scoped custom element registry');
+
+test((test) => {
+    class SomeElement1 extends HTMLElement { };
+    customElements.define('some-element', SomeElement1);
+
+    const registry = new CustomElementRegistry;
+    class SomeElement2 extends HTMLElement { };
+    registry.define('some-element', SomeElement2);
+
+    const shadowRoot = createConnectedShadowTree(test, registry);
+    shadowRoot.innerHTML = '<some-element></some-element>';
+    assert_true(shadowRoot.querySelector('some-element') instanceof SomeElement2);
+}, 'innerHTML on a connected shadow root should use its scoped custom element');
+
+test((test) => {
+    class OtherElement1 extends HTMLElement { };
+    customElements.define('other-element', OtherElement1);
+
+    const registry1 = new CustomElementRegistry;
+    class SomeElement extends HTMLElement { };
+    registry1.define('some-element', SomeElement);
+    class OtherElement2 extends HTMLElement { };
+    registry1.define('other-element', OtherElement2);
+
+    const registry2 = new CustomElementRegistry;
+    class OtherElement3 extends HTMLElement { };
+    registry2.define('other-element', OtherElement3);
+
+    const shadowRoot1 = createConnectedShadowTree(test, registry1);
+    const shadowRoot2 = createConnectedShadowTree(test, registry2);
+    const someElement = shadowRoot1.createElement('some-element');
+    someElement.innerHTML = '<other-element></other-element>';
+    assert_true(someElement.querySelector('other-element') instanceof OtherElement2);
+    shadowRoot2.appendChild(someElement);
+    someElement.innerHTML = '<other-element>b</other-element>';
+    assert_true(someElement.querySelector('other-element') instanceof OtherElement3);
+    someElement.remove();
+    someElement.innerHTML = '<other-element></other-element>';
+    assert_true(someElement.querySelector('other-element') instanceof OtherElement3);
+}, 'innerHTML on an inserted element should use the scoped custom element of the ancestor shadow root');
+
+test((test) => {
+    const registry = new CustomElementRegistry;
+    class SomeElement extends HTMLElement { };
+    registry.define('some-element', SomeElement);
+    const shadowRoot = createConnectedShadowTree(test, registry);
+
+    shadowRoot.innerHTML = '<some-element></some-element><template><some-element></some-element></template>';
+    assert_equals(shadowRoot.querySelector('some-element').__proto__.constructor.name, 'SomeElement');
+    assert_equals(shadowRoot.querySelector('template').content.querySelector('some-element').__proto__.constructor.name, 'HTMLElement');
+}, 'innerHTML should not upgrade a custom element inside a template element');
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/docs/writing-tests/testdriver.md b/tests/wpt/tests/docs/writing-tests/testdriver.md
index 462c7b85503..cdf081ef318 100644
--- a/tests/wpt/tests/docs/writing-tests/testdriver.md
+++ b/tests/wpt/tests/docs/writing-tests/testdriver.md
@@ -13,8 +13,12 @@ written purely using web platform APIs. Outside of automation
 contexts, it allows human operators to provide expected input
 manually (for operations which may be described in simple terms).
 
-It is currently supported only for [testharness.js](testharness)
-tests.
+testdriver.js supports the following test types:
+* [testharness.js](testharness) tests
+* [reftests](reftests) and [print-reftests](print-reftests) that use the
+  `class=reftest-wait` attribute on the root element to control completion
+* [crashtests](crashtest) that use the `class=test-wait` attribute to control
+  completion
 
 ## Markup ##
 
diff --git a/tests/wpt/tests/dom/nodes/moveBefore/tentative/Node-moveBefore.html b/tests/wpt/tests/dom/nodes/moveBefore/tentative/Node-moveBefore.html
index 22586d169c0..bfee97b4459 100644
--- a/tests/wpt/tests/dom/nodes/moveBefore/tentative/Node-moveBefore.html
+++ b/tests/wpt/tests/dom/nodes/moveBefore/tentative/Node-moveBefore.html
@@ -87,8 +87,8 @@ test(t => {
 }, "moveBefore() on a cross-document target node throws a HierarchyRequestError");
 
 // Pre-move validity, step 3:
-// "If parent is not an Element node, then throw a "HierarchyRequestError"
-// DOMException."
+// "If parent is not a Document, DocumentFragment, or Element node, then throw a
+// "HierarchyRequestError" DOMException."
 //
 // https://whatpr.org/dom/1307.html#concept-node-ensure-pre-move-validity
 test(t => {
@@ -97,10 +97,20 @@ test(t => {
 
   assert_throws_dom("HIERARCHY_REQUEST_ERR", iframe.contentWindow.DOMException, () => {
     // Moving the body into the same place that it already is, which is a valid
-    // action in the normal case, when moving a node into an Element.
+    // action in the normal case, when moving an Element directly under the
+    // document. This is not `moveBefore()`-specific behavior; it is consistent
+    // with traditional Document insertion rules, just like `insertBefore()`.
     iframe.contentDocument.moveBefore(innerBody, null);
   });
 }, "moveBefore() into a Document throws a HierarchyRequestError");
+test(t => {
+  const iframe = document.body.appendChild(document.createElement('iframe'));
+  const comment = iframe.contentDocument.createComment("comment");
+  iframe.contentDocument.body.append(comment);
+
+  iframe.contentDocument.moveBefore(comment, null);
+  assert_equals(comment.parentNode, iframe.contentDocument);
+}, "moveBefore() CharacterData into a Document");
 test(t => {
   const comment = document.body.appendChild(document.createComment("comment"));
   const child = document.body.appendChild(document.createElement('p'));
@@ -243,10 +253,34 @@ test(() => {
   const disconnectedDestination = document.createElement('div');
   const p = disconnectedOrigin.appendChild(document.createElement('p'));
 
+  assert_throws_dom("HIERARCHY_REQUEST_ERR", () => {
+    disconnectedDestination.moveBefore(p, null);
+  });
+}, "Moving a node from a disconnected container to a disconnected new parent " +
+   "without a shared ancestor throws a HIERARCHY_REQUEST_ERR");
+
+test(() => {
+  const disconnectedOrigin = document.createElement('div');
+  const disconnectedDestination = disconnectedOrigin.appendChild(document.createElement('div'));
+  const p = disconnectedOrigin.appendChild(document.createElement('p'));
+
   disconnectedDestination.moveBefore(p, null);
 
   assert_equals(disconnectedDestination.firstChild, p, "<p> Was successfully moved");
-}, "Moving a node from a disconnected container to a disconnected new parent succeeds");
+}, "Moving a node from a disconnected container to a disconnected new parent in the same tree succeeds");
+
+test(() => {
+  const disconnectedOrigin = document.createElement('div');
+  const disconnectedHost = disconnectedOrigin.appendChild(document.createElement('div'));
+  const p = disconnectedOrigin.appendChild(document.createElement('p'));
+  const shadow = disconnectedHost.attachShadow({mode: "closed"});
+  const disconnectedDestination = shadow.appendChild(document.createElement('div'));
+
+  disconnectedDestination.moveBefore(p, null);
+
+  assert_equals(disconnectedDestination.firstChild, p, "<p> Was successfully moved");
+}, "Moving a node from a disconnected container to a disconnected new parent in the same tree succeeds," +
+   "also across shadow-roots");
 
 test(() => {
   const disconnectedOrigin = document.createElement('div');
@@ -275,7 +309,7 @@ promise_test(async t => {
     });
 
   const oldParent = document.createElement('div');
-  const newParent = document.createElement('div');
+  const newParent = oldParent.appendChild(document.createElement('div'));
   const element = oldParent.appendChild(document.createElement(element_name));
   t.add_cleanup(() => {
     element.remove();
diff --git a/tests/wpt/tests/dom/observable/tentative/observable-inspect.any.js b/tests/wpt/tests/dom/observable/tentative/observable-inspect.any.js
index 2b67dd9f3d3..24a7a5c8d48 100644
--- a/tests/wpt/tests/dom/observable/tentative/observable-inspect.any.js
+++ b/tests/wpt/tests/dom/observable/tentative/observable-inspect.any.js
@@ -20,20 +20,20 @@ test(() => {
       results.push(`inspect() subscribe ${inspectSubscribeCall}`);
     },
     next: (value) => results.push(`inspect() next ${value}`),
-    error: (e) => results.push(`inspect() error ${e.message}`),
-    complete: () => results.push(`inspect() complete`),
+    error: () => results.push('inspect() error'),
+    complete: () => results.push('inspect() complete'),
   });
 
   result.subscribe({
     next: (value) => results.push(`result next ${value}`),
-    error: (e) => results.push(`result error ${e.message}`),
-    complete: () => results.push(`result complete`),
+    error: () => results.push('result error'),
+    complete: () => results.push('result complete'),
   });
 
   result.subscribe({
     next: (value) => results.push(`result next ${value}`),
-    error: (e) => results.push(`result error ${e.message}`),
-    complete: () => results.push(`result complete`),
+    error: () => results.push('result error'),
+    complete: () => results.push('result complete'),
   });
 
   assert_array_equals(results,
@@ -267,21 +267,22 @@ test(() => {
 
 test(() => {
   const source = new Observable(subscriber => {});
+  const error = new Error("error from do subscribe handler");
 
   const result = source.inspect({
     subscribe: () => {
-      throw new Error("error from do subscribe handler");
+      throw error;
     },
   });
 
   const results = [];
   result.subscribe({
     next: () => results.push("next"),
-    error: (e) => results.push(e.message),
+    error: (e) => results.push(e),
     complete: () => results.push("complete"),
   });
 
-  assert_array_equals(results, ["error from do subscribe handler"]);
+  assert_array_equals(results, [error]);
 }, "inspect(): Errors thrown in subscribe() Inspector handler subscribe " +
    "handler are caught and sent to error callback");
 
@@ -306,7 +307,7 @@ test(() => {
       results.push(`inspect() abort ${doUnsubscribeCall} ${reason}`);
     },
     next: (value) => results.push(`inspect() next ${value}`),
-    error: (e) => results.push(`inspect() error ${e.message}`),
+    error: () => results.push('inspect() error'),
     complete: () => results.push(`inspect() complete`),
   });
 
@@ -318,7 +319,7 @@ test(() => {
         controller.abort("abort reason");
       }
     },
-    error: (e) => results.push(`result error ${e.message}`),
+    error: () => results.push('result error'),
     complete: () => results.push(`result complete`),
   }, { signal: controller.signal });
 
@@ -381,32 +382,39 @@ test(() => {
   });
 
   const results = [];
+  const error = new Error("error from inspect() subscribe handler");
 
   const result = source.inspect({
     abort: () => {
-      results.push('abort() handler run');
-      throw new Error("error from inspect() subscribe handler");
+      results.push("abort() handler run");
+      throw error;
     },
   });
 
   const controller = new AbortController();
 
-  self.when('error').take(1).subscribe(e =>
-      results.push(e.message + ', from report exception'));
+  self.when("error").take(1).subscribe((e) => {
+    results.push("from report exception");
+    results.push(e.error);
+  });
 
   result.subscribe({
     next: (value) => {
       results.push(value);
       controller.abort();
     },
-    // This should not be invoked at all!!
-    error: (e) => results.push(e.message + ', from Observer#error()'),
+    error: () => {
+      assert_unreached("This should not be invoked at all!!");
+    },
     complete: () => results.push("complete"),
-  }, {signal: controller.signal});
+  }, { signal: controller.signal });
 
-  assert_array_equals(results, [1, "abort() handler run",
-      "Uncaught Error: error from inspect() subscribe handler, from report " +
-      "exception"]);
+  assert_array_equals(results, [
+    1,
+    "abort() handler run",
+    "from report exception",
+    error,
+  ]);
 }, "inspect(): Errors thrown from inspect()'s abort() handler are caught " +
    "and reported to the global, because the subscription is already closed " +
    "by the time the handler runs");
diff --git a/tests/wpt/tests/dom/observable/tentative/observable-reduce.any.js b/tests/wpt/tests/dom/observable/tentative/observable-reduce.any.js
index 7c54aa1e8ff..18f91e34fca 100644
--- a/tests/wpt/tests/dom/observable/tentative/observable-reduce.any.js
+++ b/tests/wpt/tests/dom/observable/tentative/observable-reduce.any.js
@@ -1,4 +1,4 @@
-promise_test(async t => {
+promise_test(async (t) => {
   const source = new Observable(subscriber => {
     subscriber.next(1);
     subscriber.next(2);
@@ -24,24 +24,17 @@ promise_test(async t => {
 }, "reduce(): Reduces the values of the Observable, starting with the " +
    "initial seed value");
 
-promise_test(async () => {
+promise_test(async (t) => {
   let error = new Error('from the source');
   const source = new Observable(subscriber => {
     subscriber.next(1);
     subscriber.error(error);
   });
 
-  let thrownError = null;
-  try {
-    await source.reduce((acc, value) => acc + value, 0);
-  } catch (error) {
-    thrownError = error;
-  }
-
-  assert_equals(thrownError, error);
+  return promise_rejects_exactly(t, error, source.reduce((acc, value) => acc + value, 0));
 }, "reduce(): Rejects if the source observable emits an error");
 
-promise_test(async t => {
+promise_test(async (t) => {
   const source = new Observable(subscriber => {
     subscriber.next(1);
     subscriber.next(2);
@@ -66,7 +59,7 @@ promise_test(async t => {
 }, "reduce(): Seeds with the first value of the source, if no initial value " +
    "is provided");
 
-promise_test(async () => {
+promise_test(async (t) => {
   const logs = [];
 
   const source = new Observable(subscriber => {
@@ -82,21 +75,16 @@ promise_test(async () => {
   });
 
   const error = new Error('from the reducer');
-  let thrownError = null;
 
-  try {
-    await source.reduce((acc, value) => {
-      if (value === 2) {
-        logs.push('throw error');
-        throw error;
-      }
-      return acc + value;
-    }, 0);
-  } catch (error) {
-    thrownError = error;
-  }
+  const promiseToResult = source.reduce((acc, value) => {
+    if (value === 2) {
+      logs.push('throw error');
+      throw error;
+    }
+    return acc + value;
+  }, 0);
 
-  assert_equals(thrownError, error);
+  await promise_rejects_exactly(t, error, promiseToResult);
 
   assert_array_equals(logs, [
     'next 1',
@@ -118,7 +106,7 @@ promise_test(async () => {
   assert_equals(result, 'seed');
 }, "reduce(): When source is empty, promise resolves with initial value");
 
-promise_test(async () => {
+promise_test(async (t) => {
   // This tests behavior that is analogous to `[].reduce(() => 'reduced')`,
   // which throws a TypeError.
 
@@ -126,18 +114,11 @@ promise_test(async () => {
     subscriber.complete();
   });
 
-  let thrownError = null;
-  try {
-    await source.reduce(() => 'reduced');
-  } catch (error) {
-    thrownError = error;
-  }
-
-  assert_true(thrownError instanceof TypeError);
+  return promise_rejects_js(t, TypeError, source.reduce(() => 'reduced'));
 }, "reduce(): When source is empty, AND no seed value is provided, the " +
    "promise rejects with a TypeError");
 
-promise_test(async t => {
+promise_test(async (t) => {
   let tornDown = false;
   const source = new Observable((subscriber) => {
     subscriber.addTeardown(() => {
@@ -153,14 +134,19 @@ promise_test(async t => {
     assert_true(tornDown);
   }, 0);
 
-  let thrownError = null;
-  try {
-    await source.reduce(() => 'reduced', 'seed', { signal: abortController.signal });
-  } catch (error) {
-    thrownError = error;
-  }
-
-  assert_true(thrownError instanceof DOMException);
-  assert_equals(thrownError.name, 'AbortError');
+  return promise_rejects_dom(t, 'AbortError', source.reduce(() => 'reduced', 'seed', { signal: abortController.signal }));
 }, "reduce(): Reject with an AbortError if the subscription is aborted " +
    "before the source completes");
+
+promise_test(async () => {
+  const source = new Observable(subscriber => {
+    subscriber.complete();
+  });
+
+  const values = [{}, [], new Error("some error")];
+
+  for (let value of values) {
+    const result = await source.reduce(() => {}, value);
+    assert_equals(result, value);
+  }
+}, "reduce(): Reduces the values for different objects");
diff --git a/tests/wpt/tests/editing/data/delete.js b/tests/wpt/tests/editing/data/delete.js
index c4d1225ef35..dcb3a6a28df 100644
--- a/tests/wpt/tests/editing/data/delete.js
+++ b/tests/wpt/tests/editing/data/delete.js
@@ -3101,4 +3101,26 @@ var browserTests = [
     "<p><span contenteditable=\"false\">ab</span></p>",
     [true],
     {}],
+// Delete only first <br> to make 2 empty lines to only one line.
+["<div>abc</div><br>{}<br><div>def</div>",
+    [["delete",""]],
+    "<div>abc</div><br><div>def</div>",
+    [true],
+    {}],
+["<div><font><table><td>a</table><br>{}<br><table><td>b</table></font></div>",
+    [["delete",""]],
+    "<div><font><table><tbody><tr><td>a</td></tr></tbody></table><br><table><tbody><tr><td>b</td></tr></tbody></table></font></div>",
+    [true],
+    {}],
+// Cells shouldn't be joined, but new empty inline ancestors should be deleted.
+["<table><tr><td>a<td><b>[b</b><td><b>c</b><td><b>d]</b><td>e</table>",
+    [["delete",""]],
+    "<table><tbody><tr><td>a</td><td><br></td><td><br></td><td><br></td><td>e</td></tr></tbody></table>",
+    [true],
+    {}],
+["<table><tr><th>a<th><b>[b</b><th><b>c</b><th><b>d]</b><th>e</table>",
+    [["delete",""]],
+    "<table><tbody><tr><th>a</th><th><br></th><th><br></th><th><br></th><th>e</th></tr></tbody></table>",
+    [true],
+    {}],
 ]
diff --git a/tests/wpt/tests/editing/data/forwarddelete.js b/tests/wpt/tests/editing/data/forwarddelete.js
index a881fb6ccf4..66d978c73de 100644
--- a/tests/wpt/tests/editing/data/forwarddelete.js
+++ b/tests/wpt/tests/editing/data/forwarddelete.js
@@ -2981,4 +2981,26 @@ var browserTests = [
     "<p><span contenteditable=\"false\">ab</span></p>",
     [true],
     {}],
+// Delete only first <br> to make 2 empty lines to only one line.
+["<div>abc</div>{}<br><br><div>def</div>",
+    [["forwarddelete",""]],
+    "<div>abc</div><br><div>def</div>",
+    [true],
+    {}],
+["<div><font><table><td>a</table>{}<br><br><table><td>b</table></font></div>",
+    [["forwarddelete",""]],
+    "<div><font><table><tbody><tr><td>a</td></tr></tbody></table><br><table><tbody><tr><td>b</td></tr></tbody></table></font></div>",
+    [true],
+    {}],
+// Cells shouldn't be joined, but new empty inline ancestors should be deleted.
+["<table><tr><td>a<td><b>[b</b><td><b>c</b><td><b>d]</b><td>e</table>",
+    [["forwarddelete",""]],
+    "<table><tbody><tr><td>a</td><td><br></td><td><br></td><td><br></td><td>e</td></tr></tbody></table>",
+    [true],
+    {}],
+["<table><tr><th>a<th><b>[b</b><th><b>c</b><th><b>d]</b><th>e</table>",
+    [["forwarddelete",""]],
+    "<table><tbody><tr><th>a</th><th><br></th><th><br></th><th><br></th><th>e</th></tr></tbody></table>",
+    [true],
+    {}],
 ]
diff --git a/tests/wpt/tests/editing/data/inserttext.js b/tests/wpt/tests/editing/data/inserttext.js
index 568b467f153..7e9dd05fe46 100644
--- a/tests/wpt/tests/editing/data/inserttext.js
+++ b/tests/wpt/tests/editing/data/inserttext.js
@@ -1527,4 +1527,15 @@ var browserTests = [
     "<div style=\"display:grid\"><span>abc</span><span><b>gh</b></span></div>",
     [true,true],
     {}],
+
+["<table><tr><td>a<td><b>[b</b><td><b>c</b><td><b>d]</b><td>e</table>",
+    [["inserttext","B"]],
+    "<table><tbody><tr><td>a</td><td><b>B</b></td><td><br></td><td><br></td><td>e</td></tr></tbody></table>",
+    [true],
+    {}],
+["<table><tr><th>a<th><b>[b</b><th><b>c</b><th><b>d]</b><th>e</table>",
+    [["inserttext","B"]],
+    "<table><tbody><tr><th>a</th><th><b>B</b></th><th><br></th><th><br></th><th>e</th></tr></tbody></table>",
+    [true],
+    {}],
 ]
diff --git a/tests/wpt/tests/editing/data/multitest.js b/tests/wpt/tests/editing/data/multitest.js
index e85f54addfc..2d5404ba898 100644
--- a/tests/wpt/tests/editing/data/multitest.js
+++ b/tests/wpt/tests/editing/data/multitest.js
@@ -2417,8 +2417,7 @@ var browserTests = [
     {"delete":[false,false,"",false,false,""],"inserttext":[false,false,"",false,false,""]}],
 ["<div><b>[abc]</b></div>",
     [["styleWithCSS", "false"],["delete",""],["inserttext","a"]],
-    ["<b>a</b>",
-     "<b>a</b><br>"], // The <div> should be deleted by "delete"
+    "<b>a</b>", // The <div> should be deleted by "delete"
     [true,true,true],
     {"bold":[false,true,"",false,true,""]}],
 ["<div>abc<b>[def]</b></div>",
@@ -2429,30 +2428,22 @@ var browserTests = [
     {"bold":[false,true,"",false,true,""]}],
 ["<div><b>[abc]</b></div>",
     [["styleWithCSS", "false"],["delete",""],["insertparagraph",""],["inserttext","a"]],
-    ["<br><div><b>a</b></div>",
-     "<br><div><b>a</b><br></div>"], // The <div> should be deleted by "delete", but new text should be in new <div>
+    "<br><div><b>a</b></div>", // The <div> should be deleted by "delete", but new text should be in new <div>
     [true,true,true,true],
     {"bold":[false,true,"",false,true,""]}],
 ["<div>abc<b>[def]</b></div>",
     [["styleWithCSS", "false"], ["delete",""],["insertparagraph",""],["inserttext","d"]],
-    ["<div>abc</div><div><b>d</b></div>",
-     "<div>abc</div><div><b>d</b><br></div>",
-     "<div>abc<br></div><div><b>d</b></div>",
-     "<div>abc<br></div><div><b>d</b><br></div>"],
+    "<div>abc</div><div><b>d</b></div>",
     [true,true,true,true],
     {"bold":[false,true,"",false,true,""]}],
 ["<div><b>[abc]</b></div>",
     [["styleWithCSS", "false"],["insertparagraph",""],["inserttext","a"]],
-    ["<br><div><b>a</b></div>",
-     "<br><div><b>a</b><br></div>"], // The <div> should be deleted by "insertparagraph", but new text should be in new <div>
+    "<br><div><b>a</b></div>", // The <div> should be deleted by "insertparagraph", but new text should be in new <div>
     [true,true,true],
     {"bold":[false,true,"",false,true,""]}],
 ["<div>abc<b>[def]</b></div>",
     [["styleWithCSS", "false"],["insertparagraph",""],["inserttext","d"]],
-    ["<div>abc</div><div><b>d</b></div>",
-     "<div>abc</div><div><b>d</b><br></div>",
-     "<div>abc<br></div><div><b>d</b></div>",
-     "<div>abc<br></div><div><b>d</b><br></div>"],
+    "<div>abc</div><div><b>d</b></div>",
     [true,true,true],
     {"bold":[false,true,"",false,true,""]}],
 
@@ -2466,29 +2457,22 @@ var browserTests = [
     {"bold":[false,true,"",false,false,""]}],
 ["<div><i><b>abc[]<br></b></i></div>",
     [["styleWithCSS", "false"],["bold",""],["inserttext","d"]],
-    ["<div><i><b>abc</b>d</i></div>",
-     "<div><i><b>abc</b>d<br></i></div>",
-     "<div><i><b>abc</b>d</i><br></div>"],
+    "<div><i><b>abc</b>d</i></div>",
     [true,true,true],
     {"bold":[false,true,"",false,false,""]}],
 ["<div><i><b>abc[]</b><br></i></div>",
     [["styleWithCSS", "false"],["bold",""],["inserttext","d"]],
-    ["<div><i><b>abc</b>d</i></div>",
-     "<div><i><b>abc</b>d<br></i></div>"],
+    "<div><i><b>abc</b>d</i></div>",
     [true,true,true],
     {"bold":[false,true,"",false,false,""]}],
 ["<div><b><i>abc[]<br></i></b></div>",
     [["styleWithCSS", "false"],["bold",""],["inserttext","d"]],
-    ["<div><b><i>abc</i></b><i>d</i></div>",
-     "<div><b><i>abc</i></b><i>d<br></i></div>",
-     "<div><b><i>abc</i></b><i>d</i><br></div>"],
+    "<div><b><i>abc</i></b><i>d</i></div>",
     [true,true,true],
     {"bold":[false,true,"",false,false,""]}],
 ["<div><b><i>abc[]</i><br></b></div>",
     [["styleWithCSS", "false"],["bold",""],["inserttext","d"]],
-    ["<div><b><i>abc</i></b><i>d</i></div>",
-     "<div><b><i>abc</i></b><i>d<br></i></div>",
-     "<div><b><i>abc</i></b><i>d</i><br></div>"],
+    "<div><b><i>abc</i></b><i>d</i></div>",
     [true,true,true],
     {"bold":[false,true,"",false,false,""]}],
 // In this case, second line text should be keep bold style.
@@ -2862,8 +2846,7 @@ var browserTests = [
     {"fontsize":[false,false,"7",false,false,"4"]}],
 ["<span style=font-weight:bold>{}<br></span></b>",
     [["stylewithcss","true"],["italic",""],["insertText","a"]],
-    ["<span style=\"font-weight:bold; font-style:italic\">a[]<br></span>",
-     "<span style=\"font-weight:bold; font-style:italic\">a[]</span>"],
+    "<span style=\"font-weight:bold; font-style:italic\">a[]</span>",
     [true,true,true],
     {}],
 
@@ -3244,4 +3227,27 @@ var browserTests = [
      "<b><span contenteditable=\"false\">abc</span></b><b>Y</b><i>def</i>"],
     [true,true],
     {}],
+
+["<table><tr><td>a<td><b>[b</b><td><b>c</b><td><b>d]</b><td>e</table>",
+    [["delete",""],["inserttext","B"]],
+    "<table><tbody><tr><td>a</td><td><b>B</b></td><td><br></td><td><br></td><td>e</td></tr></tbody></table>",
+    [true,true],
+    {}],
+["<table><tr><th>a<th><b>[b</b><th><b>c</b><th><b>d]</b><th>e</table>",
+    [["delete",""],["inserttext","B"]],
+    "<table><tbody><tr><th>a</th><th><b>B</b></th><th><br></th><th><br></th><th>e</th></tr></tbody></table>",
+    [true,true],
+    {}],
+["<table><tr><td>a<td><b>[b</b><td><b>c</b><td><b>d]</b><td>e</table>",
+    [["forwarddelete",""],["inserttext","B"]],
+    ["<table><tbody><tr><td>a</td><td><b>B</b></td><td><br></td><td><br></td><td>e</td></tr></tbody></table>",
+     "<table><tbody><tr><td>a</td><td><br></td><td><br></td><td><b>B</b></td><td>e</td></tr></tbody></table>"],
+    [true,true],
+    {}],
+["<table><tr><th>a<th><b>[b</b><th><b>c</b><th><b>d]</b><th>e</table>",
+    [["forwarddelete",""],["inserttext","B"]],
+    ["<table><tbody><tr><th>a</th><th><b>B</b></th><th><br></th><th><br></th><th>e</th></tr></tbody></table>",
+     "<table><tbody><tr><th>a</th><th><br></th><th><br></th><th><b>B</b></th><th>e</th></tr></tbody></table>"],
+    [true,true],
+    {}],
 ]
diff --git a/tests/wpt/tests/editing/include/editor-test-utils.js b/tests/wpt/tests/editing/include/editor-test-utils.js
index b302d19a117..b2e53515e0f 100644
--- a/tests/wpt/tests/editing/include/editor-test-utils.js
+++ b/tests/wpt/tests/editing/include/editor-test-utils.js
@@ -109,6 +109,15 @@ class EditorTestUtils {
     );
   }
 
+  sendCutShortcutKey() {
+    return this.sendKey(
+      "x",
+      this.window.navigator.platform.includes("Mac")
+        ? this.kMeta
+        : this.kControl
+    );
+  }
+
   sendPasteShortcutKey() {
     return this.sendKey(
       "v",
diff --git a/tests/wpt/tests/editing/run/delete-chars-following-collapsible-white-space.html b/tests/wpt/tests/editing/run/delete-chars-following-collapsible-white-space.html
new file mode 100644
index 00000000000..7340a9ebf72
--- /dev/null
+++ b/tests/wpt/tests/editing/run/delete-chars-following-collapsible-white-space.html
@@ -0,0 +1,284 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="timeout" content="long">
+<title>Test Backspace to delete following character(s) of collapsible white-space</title>
+<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/testdriver-actions.js"></script>
+<script src="../include/editor-test-utils.js"></script>
+<script>
+"use strict";
+
+addEventListener("load", () => {
+  const editingHost = document.querySelector("div[contenteditable]");
+  editingHost.focus();
+  const utils = new EditorTestUtils(editingHost);
+  for (const data of [
+    {
+      init: "<p> a[]</p>",
+      // The white-space before "a" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p><br></p>",
+        "<p> <br></p>",
+      ],
+    },
+    {
+      init: "<p><b> a[]</b></p>",
+      // The white-space before "a" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p><br></p>",
+        "<p><b><br></b></p>",
+        "<p><b> <br></b></p>",
+      ],
+    },
+    {
+      init: "<p>abc d[]</p>",
+      expected: [
+        "<p>abc <br></p>",
+        "<p>abc&nbsp;</p>",
+      ],
+    },
+    {
+      init: "<p><b>abc d[]</b></p>",
+      expected: [
+        "<p><b>abc <br></b></p>",
+        "<p><b>abc&nbsp;</b></p>",
+      ],
+    },
+    {
+      init: "<p>abc d[]<br></p>",
+      expected: [
+        "<p>abc <br></p>",
+        "<p>abc&nbsp;</p>",
+      ],
+    },
+    {
+      init: " a[]<p>bc</p>",
+      // The white-space before "a" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<br><p>bc</p>",
+        " <br><p>bc</p>",
+      ],
+    },
+    {
+      init: "abc d[]<p>ef</p>",
+      expected: [
+        "abc <br><p>ef</p>",
+        "abc&nbsp;<p>ef</p>",
+      ],
+    },
+    {
+      init: "<b>abc d[]</b><p>ef</p>",
+      expected: [
+        "<b>abc <br></b><p>ef</p>",
+        "<b>abc&nbsp;</b><p>ef</p>",
+      ],
+    },
+    {
+      init: "<p>abc</p> d[]",
+      // The white-space before "d" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p>abc</p><br>",
+        "<p>abc</p> <br>",
+      ],
+    },
+    {
+      init: "<p>abc</p>def g[]",
+      expected: [
+        "<p>abc</p>def <br>",
+        "<p>abc</p>def&nbsp;",
+      ],
+    },
+    {
+      init: "<p>abc</p><b> d[]</b>",
+      // The white-space before "d" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p>abc</p><br>",
+        "<p>abc</p><b><br></b>",
+        "<p>abc</p><b> <br></b>",
+      ],
+    },
+    {
+      init: "<p>abc</p>def g[]<p>hij</p>",
+      expected: [
+        "<p>abc</p>def <br><p>hij</p>",
+        "<p>abc</p>def&nbsp;<br><p>hij</p>",
+      ],
+    },
+    {
+      init: "<p>abc</p> d[]<p>efg</p>",
+      // The white-space before "d" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p>abc</p><br><p>efg</p>",
+        "<p>abc</p> <br><p>efg</p>",
+      ],
+    },
+    {
+      init: "<p>abc</p><b> d[]</b><p>efg</p>",
+      // The white-space before "d" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p>abc</p><br><p>efg</p>",
+        "<p>abc</p><b><br></b><p>efg</p>",
+        "<p>abc</p><b> <br></b><p>efg</p>",
+      ],
+    },
+  ]) {
+    promise_test(async () => {
+      utils.setupEditingHost(data.init);
+      await utils.sendBackspaceKey();
+      if (Array.isArray(data.expected)) {
+        assert_in_array(editingHost.innerHTML, data.expected);
+      } else {
+        assert_equals(editingHost.innerHTML, data.expected);
+      }
+    }, `Backspace when ${data.init}`);
+    promise_test(async () => {
+      utils.setupEditingHost(data.init);
+      getSelection().modify("extend", "left", "character");
+      await utils.sendBackspaceKey();
+      if (Array.isArray(data.expected)) {
+        assert_in_array(editingHost.innerHTML, data.expected);
+      } else {
+        assert_equals(editingHost.innerHTML, data.expected);
+      }
+    }, `Backspace when ${data.init} after extending selection backward`);
+  }
+  const deleteWordModifier =
+    this.window.navigator.platform.includes("Mac") ? utils.kAlt : utils.kControl;
+  for (const data of [
+    {
+      init: "<p> abc[]</p>",
+      // The white-space before "abc" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p><br></p>",
+        "<p> <br></p>",
+      ],
+    },
+    {
+      init: "<p>abc def[]</p>",
+      expected: [
+        "<p>abc <br></p>",
+        "<p>abc&nbsp;</p>",
+      ],
+    },
+    {
+      init: "<p><b>abc def[]</b></p>",
+      expected: [
+        "<p><b>abc <br></b></p>",
+        "<p><b>abc&nbsp;</b></p>",
+      ],
+    },
+    {
+      init: "<p>abc def[]<br></p>",
+      expected: [
+        "<p>abc <br></p>",
+        "<p>abc&nbsp;</p>",
+      ],
+    },
+    {
+      init: " abc[]<p>def</p>",
+      // The white-space before "abc" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<br><p>def</p>",
+        " <br><p>def</p>",
+      ],
+    },
+    {
+      init: "abc def[]<p>ghi</p>",
+      expected: [
+        "abc <br><p>ghi</p>",
+        "abc&nbsp;<p>ghi</p>",
+      ],
+    },
+    {
+      init: "<b>abc def[]</b><p>ghi</p>",
+      expected: [
+        "<b>abc <br></b><p>ghi</p>",
+        "<b>abc&nbsp;</b><p>ghi</p>",
+      ],
+    },
+    {
+      init: "<p>abc</p> def[]",
+      // The white-space before "def" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p>abc</p><br>",
+        "<p>abc</p> <br>",
+      ],
+    },
+    {
+      init: "<p>abc</p>def ghi[]",
+      expected: [
+        "<p>abc</p>def <br>",
+        "<p>abc</p>def&nbsp;",
+      ],
+    },
+    {
+      init: "<p>abc</p><b> def[]</b>",
+      // The white-space before "def" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p>abc</p><br>",
+        "<p>abc</p><b><br></b>",
+        "<p>abc</p><b> <br></b>",
+      ],
+    },
+    {
+      init: "<p>abc</p>def ghi[]<p>jkl</p>",
+      expected: [
+        "<p>abc</p>def <br><p>jkl</p>",
+        "<p>abc</p>def&nbsp;<br><p>jkl</p>",
+      ],
+    },
+    {
+      init: "<p>abc</p> def[]<p>ghi</p>",
+      // The white-space before "def" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p>abc</p><br><p>ghi</p>",
+        "<p>abc</p> <br><p>ghi</p>",
+      ],
+    },
+    {
+      init: "<p>abc</p><b> def[]</b><p>ghi</p>",
+      // The white-space before "def" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p>abc</p><br><p>ghi</p>",
+        "<p>abc</p><b><br></b><p>ghi</p>",
+        "<p>abc</p><b> <br></b><p>ghi</p>",
+      ],
+    },
+  ]) {
+    promise_test(async () => {
+      utils.setupEditingHost(data.init);
+      await utils.sendBackspaceKey(deleteWordModifier);
+      if (Array.isArray(data.expected)) {
+        assert_in_array(editingHost.innerHTML, data.expected);
+      } else {
+        assert_equals(editingHost.innerHTML, data.expected);
+      }
+    }, `${
+      deleteWordModifier == utils.kControl ? "Ctrl" : "Alt"
+    }+Backspace when "${data.init}"`);
+  }
+}, {once: true});
+</script>
+</head>
+<body>
+  <div contenteditable></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/editing/run/delete-to-make-editing-host-empty.html b/tests/wpt/tests/editing/run/delete-to-make-editing-host-empty.html
new file mode 100644
index 00000000000..d16bb88d6b0
--- /dev/null
+++ b/tests/wpt/tests/editing/run/delete-to-make-editing-host-empty.html
@@ -0,0 +1,111 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title></title>
+<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/testdriver-actions.js"></script>
+<script src="../include/editor-test-utils.js"></script>
+<script>
+"use strict";
+
+addEventListener("load", () => {
+  const editingHost = document.querySelector("div[contenteditable]");
+  const editingHostHeightWhenEmpty = editingHost.getBoundingClientRect().height;
+  editingHost.innerHTML = "<br>";
+  const editingHostHeightWhenHasBR = editingHost.getBoundingClientRect().height;
+  test(() => {
+    assert_true(
+      Math.abs(editingHostHeightWhenHasBR - editingHostHeightWhenEmpty) <= 1,
+      `"<div contenteditable></div>" height: ${
+        editingHostHeightWhenEmpty
+      }, "<div contenteditable><br></div>" height: ${editingHostHeightWhenHasBR}`
+    );
+  }, `"<div contenteditable></div>" and "<div contenteditable><br></div>" should have almost same height`);
+  test(() => {
+    const editingHostHeightWhenHasChar = editingHost.getBoundingClientRect().height;
+    assert_true(
+      Math.abs(editingHostHeightWhenHasBR - editingHostHeightWhenHasChar) <= 1,
+      `"<div contenteditable><br></div>" height: ${
+        editingHostHeightWhenHasBR
+      }, "<div contenteditable>a</div>" height: ${editingHostHeightWhenHasChar}`
+    );
+  }, `"<div contenteditable><br></div>" and "<div contenteditable>a</div>" should have almost same height`);
+  editingHost.focus();
+  const utils = new EditorTestUtils(editingHost);
+  promise_test(async () => {
+    utils.setupEditingHost("a[]");
+    await utils.sendBackspaceKey();
+    assert_equals(editingHost.innerHTML, "<br>", "Comparing innerHTML");
+    const editingHostHeight = editingHost.getBoundingClientRect().height;
+    assert_equals(editingHostHeightWhenHasBR, editingHostHeight, "Comparing editing host height");
+  }, `Backspace when "a[]"`);
+  promise_test(async () => {
+    utils.setupEditingHost("[]a");
+    await utils.sendDeleteKey();
+    assert_equals(editingHost.innerHTML, "<br>", "Comparing innerHTML");
+    const editingHostHeight = editingHost.getBoundingClientRect().height;
+    assert_equals(editingHostHeightWhenHasBR, editingHostHeight, "Comparing editing host height");
+  }, `Delete when "[]a"`);
+  promise_test(async () => {
+    utils.setupEditingHost("{a}");
+    await utils.sendBackspaceKey();
+    assert_equals(editingHost.innerHTML, "<br>", "Comparing innerHTML");
+    const editingHostHeight = editingHost.getBoundingClientRect().height;
+    assert_equals(editingHostHeightWhenHasBR, editingHostHeight, "Comparing editing host height");
+  }, `Backspace when "{a}"`);
+  promise_test(async () => {
+    utils.setupEditingHost("{a}");
+    await utils.sendDeleteKey();
+    assert_equals(editingHost.innerHTML, "<br>", "Comparing innerHTML");
+    const editingHostHeight = editingHost.getBoundingClientRect().height;
+    assert_equals(editingHostHeightWhenHasBR, editingHostHeight, "Comparing editing host height");
+  }, `Delete when "{a}"`);
+  promise_test(async () => {
+    utils.setupEditingHost("{a}");
+    await utils.sendCutShortcutKey();
+    assert_equals(editingHost.innerHTML, "<br>", "Comparing innerHTML");
+    const editingHostHeight = editingHost.getBoundingClientRect().height;
+    assert_equals(editingHostHeightWhenHasBR, editingHostHeight, "Comparing editing host height");
+  }, `Accel - x when "{a}"`);
+  promise_test(async () => {
+    utils.setupEditingHost("<span>a[]</span>");
+    await utils.sendBackspaceKey();
+    assert_equals(editingHost.innerHTML, "<br>", "Comparing innerHTML");
+    const editingHostHeight = editingHost.getBoundingClientRect().height;
+    assert_equals(editingHostHeightWhenHasBR, editingHostHeight, "Comparing editing host height");
+  }, `Backspace when "<span>a[]</span>"`);
+  promise_test(async () => {
+    utils.setupEditingHost("<span>[]a</span>");
+    await utils.sendDeleteKey();
+    assert_equals(editingHost.innerHTML, "<br>", "Comparing innerHTML");
+    const editingHostHeight = editingHost.getBoundingClientRect().height;
+    assert_equals(editingHostHeightWhenHasBR, editingHostHeight, "Comparing editing host height");
+  }, `Delete when "<span>[]a</span>"`);
+  promise_test(async () => {
+    utils.setupEditingHost("<span>{a}</span>");
+    await utils.sendBackspaceKey();
+    assert_equals(editingHost.innerHTML, "<br>", "Comparing innerHTML");
+    const editingHostHeight = editingHost.getBoundingClientRect().height;
+    assert_equals(editingHostHeightWhenHasBR, editingHostHeight, "Comparing editing host height");
+  }, `Backspace when "<span>{a}</span>"`);
+  promise_test(async () => {
+    utils.setupEditingHost("{}");
+    await utils.sendBackspaceKey();
+    assert_equals(editingHost.innerHTML, "", "Comparing innerHTML");
+  }, `Backspace when "{}"`);
+  promise_test(async () => {
+    utils.setupEditingHost("{}");
+    await utils.sendDeleteKey();
+    assert_equals(editingHost.innerHTML, "", "Comparing innerHTML");
+  }, `Delete when "{}"`);
+}, {once: true});
+</script>
+</head>
+<body>
+  <div contenteditable></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/editing/run/forwarddelete-chars-following-collapsible-white-space.html b/tests/wpt/tests/editing/run/forwarddelete-chars-following-collapsible-white-space.html
new file mode 100644
index 00000000000..9cfdd9879ec
--- /dev/null
+++ b/tests/wpt/tests/editing/run/forwarddelete-chars-following-collapsible-white-space.html
@@ -0,0 +1,284 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<meta name="timeout" content="long">
+<title>Test (forward) Delete to delete following character(s) of collapsible white-space</title>
+<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/testdriver-actions.js"></script>
+<script src="../include/editor-test-utils.js"></script>
+<script>
+"use strict";
+
+addEventListener("load", () => {
+  const editingHost = document.querySelector("div[contenteditable]");
+  editingHost.focus();
+  const utils = new EditorTestUtils(editingHost);
+  for (const data of [
+    {
+      init: "<p> []a</p>",
+      // The white-space before "a" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p><br></p>",
+        "<p> <br></p>",
+      ],
+    },
+    {
+      init: "<p><b> []a</b></p>",
+      // The white-space before "a" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p><br></p>",
+        "<p><b><br></b></p>",
+        "<p><b> <br></b></p>",
+      ],
+    },
+    {
+      init: "<p>abc []d</p>",
+      expected: [
+        "<p>abc <br></p>",
+        "<p>abc&nbsp;</p>",
+      ],
+    },
+    {
+      init: "<p><b>abc []d</b></p>",
+      expected: [
+        "<p><b>abc <br></b></p>",
+        "<p><b>abc&nbsp;</b></p>",
+      ],
+    },
+    {
+      init: "<p>abc []d<br></p>",
+      expected: [
+        "<p>abc <br></p>",
+        "<p>abc&nbsp;</p>",
+      ],
+    },
+    {
+      init: " []a<p>bc</p>",
+      // The white-space before "a" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<br><p>bc</p>",
+        " <br><p>bc</p>",
+      ],
+    },
+    {
+      init: "abc []d<p>ef</p>",
+      expected: [
+        "abc <br><p>ef</p>",
+        "abc&nbsp;<p>ef</p>",
+      ],
+    },
+    {
+      init: "<b>abc []d</b><p>ef</p>",
+      expected: [
+        "<b>abc <br></b><p>ef</p>",
+        "<b>abc&nbsp;</b><p>ef</p>",
+      ],
+    },
+    {
+      init: "<p>abc</p> []d",
+      // The white-space before "d" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p>abc</p><br>",
+        "<p>abc</p> <br>",
+      ],
+    },
+    {
+      init: "<p>abc</p>def []g",
+      expected: [
+        "<p>abc</p>def <br>",
+        "<p>abc</p>def&nbsp;",
+      ],
+    },
+    {
+      init: "<p>abc</p><b> []d</b>",
+      // The white-space before "d" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p>abc</p><br>",
+        "<p>abc</p><b><br></b>",
+        "<p>abc</p><b> <br></b>",
+      ],
+    },
+    {
+      init: "<p>abc</p>def []g<p>hij</p>",
+      expected: [
+        "<p>abc</p>def <br><p>hij</p>",
+        "<p>abc</p>def&nbsp;<br><p>hij</p>",
+      ],
+    },
+    {
+      init: "<p>abc</p> []d<p>efg</p>",
+      // The white-space before "d" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p>abc</p><br><p>efg</p>",
+        "<p>abc</p> <br><p>efg</p>",
+      ],
+    },
+    {
+      init: "<p>abc</p><b> []d</b><p>efg</p>",
+      // The white-space before "d" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p>abc</p><br><p>efg</p>",
+        "<p>abc</p><b><br></b><p>efg</p>",
+        "<p>abc</p><b> <br></b><p>efg</p>",
+      ],
+    },
+  ]) {
+    promise_test(async () => {
+      utils.setupEditingHost(data.init);
+      await utils.sendDeleteKey();
+      if (Array.isArray(data.expected)) {
+        assert_in_array(editingHost.innerHTML, data.expected);
+      } else {
+        assert_equals(editingHost.innerHTML, data.expected);
+      }
+    }, `Backspace when ${data.init}`);
+    promise_test(async () => {
+      utils.setupEditingHost(data.init);
+      getSelection().modify("extend", "right", "character");
+      await utils.sendDeleteKey();
+      if (Array.isArray(data.expected)) {
+        assert_in_array(editingHost.innerHTML, data.expected);
+      } else {
+        assert_equals(editingHost.innerHTML, data.expected);
+      }
+    }, `Delete when ${data.init} after extending selection forward`);
+  }
+  const deleteWordModifier =
+    this.window.navigator.platform.includes("Mac") ? utils.kAlt : utils.kControl;
+  for (const data of [
+    {
+      init: "<p> []abc</p>",
+      // The white-space before "abc" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p><br></p>",
+        "<p> <br></p>",
+      ],
+    },
+    {
+      init: "<p>abc []def</p>",
+      expected: [
+        "<p>abc <br></p>",
+        "<p>abc&nbsp;</p>",
+      ],
+    },
+    {
+      init: "<p><b>abc []def</b></p>",
+      expected: [
+        "<p><b>abc <br></b></p>",
+        "<p><b>abc&nbsp;</b></p>",
+      ],
+    },
+    {
+      init: "<p>abc []def<br></p>",
+      expected: [
+        "<p>abc <br></p>",
+        "<p>abc&nbsp;</p>",
+      ],
+    },
+    {
+      init: " []abc<p>def</p>",
+      // The white-space before "abc" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<br><p>def</p>",
+        " <br><p>def</p>",
+      ],
+    },
+    {
+      init: "abc []def<p>ghi</p>",
+      expected: [
+        "abc <br><p>ghi</p>",
+        "abc&nbsp;<p>ghi</p>",
+      ],
+    },
+    {
+      init: "<b>abc []def</b><p>ghi</p>",
+      expected: [
+        "<b>abc <br></b><p>ghi</p>",
+        "<b>abc&nbsp;</b><p>ghi</p>",
+      ],
+    },
+    {
+      init: "<p>abc</p> []def",
+      // The white-space before "def" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p>abc</p><br>",
+        "<p>abc</p> <br>",
+      ],
+    },
+    {
+      init: "<p>abc</p>def []ghi",
+      expected: [
+        "<p>abc</p>def <br>",
+        "<p>abc</p>def&nbsp;",
+      ],
+    },
+    {
+      init: "<p>abc</p><b> []def</b>",
+      // The white-space before "def" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p>abc</p><br>",
+        "<p>abc</p><b><br></b>",
+        "<p>abc</p><b> <br></b>",
+      ],
+    },
+    {
+      init: "<p>abc</p>def []ghi<p>jkl</p>",
+      expected: [
+        "<p>abc</p>def <br><p>jkl</p>",
+        "<p>abc</p>def&nbsp;<br><p>jkl</p>",
+      ],
+    },
+    {
+      init: "<p>abc</p> []def<p>ghi</p>",
+      // The white-space before "def" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p>abc</p><br><p>ghi</p>",
+        "<p>abc</p> <br><p>ghi</p>",
+      ],
+    },
+    {
+      init: "<p>abc</p><b> []def</b><p>ghi</p>",
+      // The white-space before "def" is invisible due to immediately after the
+      // block boundary.  Therefore, it may be deleted.
+      expected: [
+        "<p>abc</p><br><p>ghi</p>",
+        "<p>abc</p><b><br></b><p>ghi</p>",
+        "<p>abc</p><b> <br></b><p>ghi</p>",
+      ],
+    },
+  ]) {
+    promise_test(async () => {
+      utils.setupEditingHost(data.init);
+      await utils.sendDeleteKey(deleteWordModifier);
+      if (Array.isArray(data.expected)) {
+        assert_in_array(editingHost.innerHTML, data.expected);
+      } else {
+        assert_equals(editingHost.innerHTML, data.expected);
+      }
+    }, `${
+      deleteWordModifier == utils.kControl ? "Ctrl" : "Alt"
+    }+Delete when "${data.init}"`);
+  }
+}, {once: true});
+</script>
+</head>
+<body>
+  <div contenteditable></div>
+</body>
+</html>
diff --git a/tests/wpt/tests/element-timing/resources/element-timing-helpers.js b/tests/wpt/tests/element-timing/resources/element-timing-helpers.js
index 8175b0f3850..2c1bd195ea7 100644
--- a/tests/wpt/tests/element-timing/resources/element-timing-helpers.js
+++ b/tests/wpt/tests/element-timing/resources/element-timing-helpers.js
@@ -16,6 +16,15 @@ function checkElementInternal(entry, expectedUrl, expectedIdentifier, expectedID
   assert_equals(entry.duration, 0, 'duration should be 0');
   assert_equals(entry.id, expectedID, 'id does not match');
   assert_greater_than_equal(entry.renderTime, beforeRender, 'renderTime greater than beforeRender');
+  assert_greater_than_equal(entry.paintTime, beforeRender, 'paintTime should represent the time when the UA started painting');
+
+  // PaintTimingMixin
+  if ("presentationTime" in entry) {
+    assert_greater_than(entry.presentationTime, entry.paintTime);
+    assert_equals(entry.presentationTime, entry.renderTime);
+  } else {
+    assert_equals(entry.renderTime, entry.paintTime);
+  }
   assert_greater_than_equal(performance.now(), entry.renderTime, 'renderTime bounded by now()');
   if (expectedElement !== null) {
     assert_equals(entry.element, expectedElement, 'element does not match');
diff --git a/tests/wpt/tests/fetch/metadata/generated/audioworklet.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/audioworklet.https.sub.html
index 64fb7607e26..5ea1cdc8bc9 100644
--- a/tests/wpt/tests/fetch/metadata/generated/audioworklet.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/audioworklet.https.sub.html
@@ -266,6 +266,32 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsCrossSite'], {mime: 'text/javascript'}),
+        t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Cross-site');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsSameSite'], {mime: 'text/javascript'}),
+        t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/css-font-face.https.sub.tentative.html b/tests/wpt/tests/fetch/metadata/generated/css-font-face.https.sub.tentative.html
index 332effeb1f8..481355c0a6c 100644
--- a/tests/wpt/tests/fetch/metadata/generated/css-font-face.https.sub.tentative.html
+++ b/tests/wpt/tests/fetch/metadata/generated/css-font-face.https.sub.tentative.html
@@ -225,6 +225,26 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
       });
   }, 'sec-fetch-user');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(t, makeRequestURL(key, ['httpsCrossSite']))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Cross-site');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(t, makeRequestURL(key, ['httpsSameSite']))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Same site');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/css-font-face.sub.tentative.html b/tests/wpt/tests/fetch/metadata/generated/css-font-face.sub.tentative.html
index 8a0b90cee10..a0d2a06fed3 100644
--- a/tests/wpt/tests/fetch/metadata/generated/css-font-face.sub.tentative.html
+++ b/tests/wpt/tests/fetch/metadata/generated/css-font-face.sub.tentative.html
@@ -160,6 +160,36 @@ Sources:
       });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination');
 
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(t, makeRequestURL(key, ['httpOrigin']))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(t, makeRequestURL(key, ['httpSameSite']))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(t, makeRequestURL(key, ['httpCrossSite']))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination');
+
   promise_test((t) => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/css-images.https.sub.tentative.html b/tests/wpt/tests/fetch/metadata/generated/css-images.https.sub.tentative.html
index 3fa24019289..63dcb4bf027 100644
--- a/tests/wpt/tests/fetch/metadata/generated/css-images.https.sub.tentative.html
+++ b/tests/wpt/tests/fetch/metadata/generated/css-images.https.sub.tentative.html
@@ -1374,6 +1374,151 @@ Sources:
       .then(t.step_func_done(), t.unreached_func());
   }, 'list-style-image sec-fetch-user');
 
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsCrossSite']);
+
+    declarations.push(`background-image: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_equals(headers['sec-fetch-storage-access'], 'none');
+        })
+        .then(t.step_func_done(), (error) => t.unreached_func());
+  }, 'background-image sec-fetch-storage-access - Cross-site');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsCrossSite']);
+
+    declarations.push(`border-image: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'border-image sec-fetch-storage-access - Cross-site');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsCrossSite']);
+
+    declarations.push(`content: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'content sec-fetch-storage-access - Cross-site');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsCrossSite']);
+
+    declarations.push(`cursor: url("${url}"), auto;`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'cursor sec-fetch-storage-access - Cross-site');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsCrossSite']);
+
+    declarations.push(`list-style-image: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'list-style-image sec-fetch-storage-access - Cross-site');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsSameSite']);
+
+    declarations.push(`background-image: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+        .then(t.step_func_done(), (error) => t.unreached_func());
+  }, 'background-image sec-fetch-storage-access - Same site');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsSameSite']);
+
+    declarations.push(`border-image: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'border-image sec-fetch-storage-access - Same site');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsSameSite']);
+
+    declarations.push(`content: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'content sec-fetch-storage-access - Same site');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsSameSite']);
+
+    declarations.push(`cursor: url("${url}"), auto;`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'cursor sec-fetch-storage-access - Same site');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsSameSite']);
+
+    declarations.push(`list-style-image: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'list-style-image sec-fetch-storage-access - Same site');
+
   iframe.srcdoc = declarations.map((declaration, index) => `
     <style>.el${index} { ${declaration} }</style><div class="el${index}"></div>`
     ).join('');
diff --git a/tests/wpt/tests/fetch/metadata/generated/css-images.sub.tentative.html b/tests/wpt/tests/fetch/metadata/generated/css-images.sub.tentative.html
index f1ef27cf087..2f6f2f75f1b 100644
--- a/tests/wpt/tests/fetch/metadata/generated/css-images.sub.tentative.html
+++ b/tests/wpt/tests/fetch/metadata/generated/css-images.sub.tentative.html
@@ -869,6 +869,216 @@ Sources:
       .then(t.step_func_done(), t.unreached_func());
   }, 'list-style-image sec-fetch-user - Not sent to non-trustworthy cross-site destination');
 
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpOrigin']);
+
+    declarations.push(`background-image: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+        .then(t.step_func_done(), (error) => t.unreached_func());
+  }, 'background-image sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpOrigin']);
+
+    declarations.push(`border-image: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'border-image sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpOrigin']);
+
+    declarations.push(`content: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'content sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpOrigin']);
+
+    declarations.push(`cursor: url("${url}"), auto;`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'cursor sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpOrigin']);
+
+    declarations.push(`list-style-image: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'list-style-image sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpSameSite']);
+
+    declarations.push(`background-image: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+        .then(t.step_func_done(), (error) => t.unreached_func());
+  }, 'background-image sec-fetch-storage-access - Not sent to non-trustworthy same-site destination');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpSameSite']);
+
+    declarations.push(`border-image: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'border-image sec-fetch-storage-access - Not sent to non-trustworthy same-site destination');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpSameSite']);
+
+    declarations.push(`content: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'content sec-fetch-storage-access - Not sent to non-trustworthy same-site destination');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpSameSite']);
+
+    declarations.push(`cursor: url("${url}"), auto;`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'cursor sec-fetch-storage-access - Not sent to non-trustworthy same-site destination');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpSameSite']);
+
+    declarations.push(`list-style-image: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'list-style-image sec-fetch-storage-access - Not sent to non-trustworthy same-site destination');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpCrossSite']);
+
+    declarations.push(`background-image: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+        .then(t.step_func_done(), (error) => t.unreached_func());
+  }, 'background-image sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpCrossSite']);
+
+    declarations.push(`border-image: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'border-image sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpCrossSite']);
+
+    declarations.push(`content: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'content sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpCrossSite']);
+
+    declarations.push(`cursor: url("${url}"), auto;`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'cursor sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination');
+
+  async_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpCrossSite']);
+
+    declarations.push(`list-style-image: url("${url}");`);
+
+    whenIframeReady
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        })
+      .then(t.step_func_done(), t.unreached_func());
+  }, 'list-style-image sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination');
+
   async_test((t) => {
     const key = '{{uuid()}}';
     const url = makeRequestURL(key, ['httpsOrigin', 'httpOrigin']);
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-a.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-a.https.sub.html
index dffd36c73ee..6bc50692761 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-a.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-a.https.sub.html
@@ -477,6 +477,46 @@ Sources:
           assert_array_equals(headers['sec-fetch-user'], ['?1']);
         });
   }, 'sec-fetch-user - no attributes with user activation');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      makeRequestURL(key, ['httpsCrossSite'], {mime: 'text/html'}),
+      {
+        test: t,
+        userActivated: false,
+        attributes: {}
+      }
+    );
+
+    // `induceRequest` does not necessarily trigger a navigation, so the Python
+    // handler must be polled until it has received the initial request.
+    return retrieve(key, {poll: true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Cross-site - no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      makeRequestURL(key, ['httpsSameSite'], {mime: 'text/html'}),
+      {
+        test: t,
+        userActivated: false,
+        attributes: {}
+      }
+    );
+
+    // `induceRequest` does not necessarily trigger a navigation, so the Python
+    // handler must be polled until it has received the initial request.
+    return retrieve(key, {poll: true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site - no attributes');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-a.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-a.sub.html
index 0661de3c871..389d3393b64 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-a.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-a.sub.html
@@ -276,6 +276,66 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination - no attributes');
 
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      makeRequestURL(key, ['httpOrigin'], {mime: 'text/html'}),
+      {
+        test: t,
+        userActivated: false,
+        attributes: {}
+      }
+    );
+
+    // `induceRequest` does not necessarily trigger a navigation, so the Python
+    // handler must be polled until it has received the initial request.
+    return retrieve(key, {poll: true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      makeRequestURL(key, ['httpSameSite'], {mime: 'text/html'}),
+      {
+        test: t,
+        userActivated: false,
+        attributes: {}
+      }
+    );
+
+    // `induceRequest` does not necessarily trigger a navigation, so the Python
+    // handler must be polled until it has received the initial request.
+    return retrieve(key, {poll: true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      makeRequestURL(key, ['httpCrossSite'], {mime: 'text/html'}),
+      {
+        test: t,
+        userActivated: false,
+        attributes: {}
+      }
+    );
+
+    // `induceRequest` does not necessarily trigger a navigation, so the Python
+    // handler must be polled until it has received the initial request.
+    return retrieve(key, {poll: true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - no attributes');
+
   promise_test((t) => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-area.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-area.https.sub.html
index be3f5f9b621..2355cceda09 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-area.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-area.https.sub.html
@@ -477,6 +477,46 @@ Sources:
           assert_array_equals(headers['sec-fetch-user'], ['?1']);
         });
   }, 'sec-fetch-user - no attributes with user activation');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      makeRequestURL(key, ['httpsCrossSite'], {mime: 'text/html'}),
+      {
+        test: t,
+        userActivated: false,
+        attributes: {}
+      }
+    );
+
+    // `induceRequest` does not necessarily trigger a navigation, so the Python
+    // handler must be polled until it has received the initial request.
+    return retrieve(key, {poll: true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Cross-site - no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      makeRequestURL(key, ['httpsSameSite'], {mime: 'text/html'}),
+      {
+        test: t,
+        userActivated: false,
+        attributes: {}
+      }
+    );
+
+    // `induceRequest` does not necessarily trigger a navigation, so the Python
+    // handler must be polled until it has received the initial request.
+    return retrieve(key, {poll: true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site - no attributes');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-area.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-area.sub.html
index 5f5c338324f..1932a66cc09 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-area.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-area.sub.html
@@ -276,6 +276,66 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination - no attributes');
 
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      makeRequestURL(key, ['httpOrigin'], {mime: 'text/html'}),
+      {
+        test: t,
+        userActivated: false,
+        attributes: {}
+      }
+    );
+
+    // `induceRequest` does not necessarily trigger a navigation, so the Python
+    // handler must be polled until it has received the initial request.
+    return retrieve(key, {poll: true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      makeRequestURL(key, ['httpSameSite'], {mime: 'text/html'}),
+      {
+        test: t,
+        userActivated: false,
+        attributes: {}
+      }
+    );
+
+    // `induceRequest` does not necessarily trigger a navigation, so the Python
+    // handler must be polled until it has received the initial request.
+    return retrieve(key, {poll: true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      makeRequestURL(key, ['httpCrossSite'], {mime: 'text/html'}),
+      {
+        test: t,
+        userActivated: false,
+        attributes: {}
+      }
+    );
+
+    // `induceRequest` does not necessarily trigger a navigation, so the Python
+    // handler must be polled until it has received the initial request.
+    return retrieve(key, {poll: true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - no attributes');
+
   promise_test((t) => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-audio.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-audio.https.sub.html
index a9d951233e2..f0ce53cbd15 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-audio.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-audio.https.sub.html
@@ -320,6 +320,33 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user - no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsCrossSite']),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access - Cross-site, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsSameSite']),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site, no attributes');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-audio.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-audio.sub.html
index 2b62632ac2e..efe9164c6d2 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-audio.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-audio.sub.html
@@ -184,6 +184,45 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination, no attributes');
 
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpOrigin']),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpSameSite']),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpCrossSite']),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination, no attributes');
+
   promise_test(() => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-embed.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-embed.https.sub.html
index 819bed888ee..2aea58d0b4d 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-embed.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-embed.https.sub.html
@@ -219,6 +219,27 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
       });
   }, 'sec-fetch-user');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(t, makeRequestURL(key, ['httpsCrossSite'], params))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+      });
+  }, 'sec-fetch-storage-access - Cross-site');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(t, makeRequestURL(key, ['httpsSameSite'], params))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Same site');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-embed.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-embed.sub.html
index b6e14a55e4a..e394d4d7f9a 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-embed.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-embed.sub.html
@@ -154,6 +154,36 @@ Sources:
       });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination');
 
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(t, makeRequestURL(key, ['httpOrigin'], params))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(t, makeRequestURL(key, ['httpSameSite'], params))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(t, makeRequestURL(key, ['httpCrossSite'], params))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination');
+
   promise_test((t) => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-frame.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-frame.https.sub.html
index 17504ff5635..7df86fb7b4b 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-frame.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-frame.https.sub.html
@@ -304,6 +304,35 @@ Sources:
           assert_array_equals(headers['sec-fetch-user'], ['?1']);
         });
   }, 'sec-fetch-user with user activation');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsCrossSite'], {mime: 'text/html'}),
+        t,
+        false
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access - Cross-site');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsSameSite'], {mime: 'text/html'}),
+        t,
+        false
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-frame.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-frame.sub.html
index 2d9a7ec97d7..6a10ca2b34d 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-frame.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-frame.sub.html
@@ -202,6 +202,48 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination');
 
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpOrigin'], {mime: 'text/html'}),
+        t,
+        false
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpSameSite'], {mime: 'text/html'}),
+        t,
+        false
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpCrossSite'], {mime: 'text/html'}),
+        t,
+        false
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination');
+
   promise_test((t) => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-iframe.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-iframe.https.sub.html
index fba1c8b9e02..10de0061480 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-iframe.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-iframe.https.sub.html
@@ -304,6 +304,35 @@ Sources:
           assert_array_equals(headers['sec-fetch-user'], ['?1']);
         });
   }, 'sec-fetch-user with user activation');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsCrossSite'], {mime: 'text/html'}),
+        t,
+        false
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access - Cross-site');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsSameSite'], {mime: 'text/html'}),
+        t,
+        false
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-iframe.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-iframe.sub.html
index 6f71cc0d254..5d2f096a3fa 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-iframe.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-iframe.sub.html
@@ -202,6 +202,48 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination');
 
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpOrigin'], {mime: 'text/html'}),
+        t,
+        false
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpSameSite'], {mime: 'text/html'}),
+        t,
+        false
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpCrossSite'], {mime: 'text/html'}),
+        t,
+        false
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination');
+
   promise_test((t) => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-img-environment-change.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-img-environment-change.https.sub.html
index a19aa117c4f..9e9c3723e9a 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-img-environment-change.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-img-environment-change.https.sub.html
@@ -352,6 +352,35 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user - no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        t,
+        makeRequestURL(key, ['httpsCrossSite'], params),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access - Cross-site, no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        t,
+        makeRequestURL(key, ['httpsSameSite'], params),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site, no attributes');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-img-environment-change.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-img-environment-change.sub.html
index 96658726ba0..0d99cb3171b 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-img-environment-change.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-img-environment-change.sub.html
@@ -222,6 +222,48 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination, no attributes');
 
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        t,
+        makeRequestURL(key, ['httpOrigin'], params),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination, no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        t,
+        makeRequestURL(key, ['httpSameSite'], params),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination, no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        t,
+        makeRequestURL(key, ['httpCrossSite'], params),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination, no attributes');
+
   promise_test((t) => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-img.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-img.https.sub.html
index 51d6e082b0e..5a0f2e4e200 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-img.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-img.https.sub.html
@@ -640,6 +640,64 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user - srcset - no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsCrossSite']),
+        'src',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access - src - Cross-site, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsCrossSite']),
+        'srcset',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access - srcset - Cross-site, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsSameSite']),
+        'src',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - src - Same site, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsSameSite']),
+        'srcset',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - srcset - Same site, no attributes');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-img.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-img.sub.html
index 5a4b152c552..23008791d7f 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-img.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-img.sub.html
@@ -364,6 +364,90 @@ Sources:
         });
   }, 'sec-fetch-user - srcset - Not sent to non-trustworthy cross-site destination, no attributes');
 
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpOrigin']),
+        'src',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - src - Not sent to non-trustworthy same-origin destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpOrigin']),
+        'srcset',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - srcset - Not sent to non-trustworthy same-origin destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpSameSite']),
+        'src',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - src - Not sent to non-trustworthy same-site destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpSameSite']),
+        'srcset',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - srcset - Not sent to non-trustworthy same-site destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpCrossSite']),
+        'src',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - src - Not sent to non-trustworthy cross-site destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpCrossSite']),
+        'srcset',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - srcset - Not sent to non-trustworthy cross-site destination, no attributes');
+
   promise_test(() => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-input-image.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-input-image.https.sub.html
index 7fa674043e2..b5537eec60e 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-input-image.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-input-image.https.sub.html
@@ -224,6 +224,27 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user - no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(makeRequestURL(key, ['httpsCrossSite']), t)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access - Cross-site, no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(makeRequestURL(key, ['httpsSameSite']), t)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site, no attributes');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-input-image.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-input-image.sub.html
index fb2a146b199..6f8743633fa 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-input-image.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-input-image.sub.html
@@ -148,6 +148,36 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination, no attributes');
 
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(makeRequestURL(key, ['httpOrigin']), t)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination, no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(makeRequestURL(key, ['httpSameSite']), t)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination, no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(makeRequestURL(key, ['httpCrossSite']), t)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination, no attributes');
+
   promise_test((t) => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-link-icon.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-link-icon.https.sub.html
index b2449607553..b41f0afe4a8 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-link-icon.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-link-icon.https.sub.html
@@ -366,6 +366,37 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
       });
   }, 'sec-fetch-user no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      t,
+      makeRequestURL(key, ['httpsCrossSite'], params),
+      {}
+    );
+
+    return retrieve(key, {poll:true})
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+      });
+  }, 'sec-fetch-storage-access - Cross-site no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      t,
+      makeRequestURL(key, ['httpsSameSite'], params),
+      {}
+    );
+
+    return retrieve(key, {poll:true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Same site no attributes');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-link-icon.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-link-icon.sub.html
index e9226c190a5..ea9ecb4ffe0 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-link-icon.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-link-icon.sub.html
@@ -228,6 +228,51 @@ Sources:
       });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination no attributes');
 
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      t,
+      makeRequestURL(key, ['httpOrigin'], params),
+      {}
+    );
+
+    return retrieve(key, {poll:true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      t,
+      makeRequestURL(key, ['httpSameSite'], params),
+      {}
+    );
+
+    return retrieve(key, {poll:true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      t,
+      makeRequestURL(key, ['httpCrossSite'], params),
+      {}
+    );
+
+    return retrieve(key, {poll:true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination no attributes');
+
   promise_test((t) => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-link-prefetch.https.optional.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-link-prefetch.https.optional.sub.html
index bdd684a2679..16347abc825 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-link-prefetch.https.optional.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-link-prefetch.https.optional.sub.html
@@ -553,6 +553,37 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
       });
   }, 'sec-fetch-user no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      t,
+      makeRequestURL(key, ['httpsCrossSite']),
+      {}
+    );
+
+    return retrieve(key, {poll:true})
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+      });
+  }, 'sec-fetch-storage-access - Cross-site no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      t,
+      makeRequestURL(key, ['httpsSameSite']),
+      {}
+    );
+
+    return retrieve(key, {poll:true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Same site no attributes');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-link-prefetch.optional.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-link-prefetch.optional.sub.html
index c2244883cc9..c9386717602 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-link-prefetch.optional.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-link-prefetch.optional.sub.html
@@ -223,6 +223,51 @@ Sources:
       });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination no attributes');
 
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      t,
+      makeRequestURL(key, ['httpOrigin']),
+      {}
+    );
+
+    return retrieve(key, {poll:true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      t,
+      makeRequestURL(key, ['httpSameSite']),
+      {}
+    );
+
+    return retrieve(key, {poll:true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    induceRequest(
+      t,
+      makeRequestURL(key, ['httpCrossSite']),
+      {}
+    );
+
+    return retrieve(key, {poll:true})
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination no attributes');
+
   promise_test((t) => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-meta-refresh.https.optional.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-meta-refresh.https.optional.sub.html
index 3a1a8eb49af..7f763d630a3 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-meta-refresh.https.optional.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-meta-refresh.https.optional.sub.html
@@ -271,6 +271,30 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsCrossSite'], responseParams), t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Cross-site');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsSameSite'], responseParams), t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-meta-refresh.optional.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-meta-refresh.optional.sub.html
index df3e92e2c8f..c1f3ecbbf86 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-meta-refresh.optional.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-meta-refresh.optional.sub.html
@@ -183,6 +183,42 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination');
 
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpOrigin'], responseParams), t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpSameSite'], responseParams), t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpCrossSite'], responseParams), t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination');
+
   promise_test((t) => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-picture.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-picture.https.sub.html
index ba6636a019a..2de087218ac 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-picture.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-picture.https.sub.html
@@ -991,6 +991,99 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user - source[srcset] - no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsCrossSite']),
+        'img',
+        'src',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access - img[src] - Cross-site, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsCrossSite']),
+        'img',
+        'srcset',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access - img[srcset] - Cross-site, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsCrossSite']),
+        'source',
+        'srcset',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access - source[srcset] - Cross-site, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsSameSite']),
+        'img',
+        'src',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - img[src] - Same site, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsSameSite']),
+        'img',
+        'srcset',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - img[srcset] - Same site, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsSameSite']),
+        'source',
+        'srcset',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - source[srcset] - Same site, no attributes');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-picture.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-picture.sub.html
index 64f851c682b..f0e087483d5 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-picture.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-picture.sub.html
@@ -575,6 +575,141 @@ Sources:
         });
   }, 'sec-fetch-user - source[srcset] - Not sent to non-trustworthy cross-site destination, no attributes');
 
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpOrigin']),
+        'img',
+        'src',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - img[src] - Not sent to non-trustworthy same-origin destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpOrigin']),
+        'img',
+        'srcset',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - img[srcset] - Not sent to non-trustworthy same-origin destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpOrigin']),
+        'source',
+        'srcset',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - source[srcset] - Not sent to non-trustworthy same-origin destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpSameSite']),
+        'img',
+        'src',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - img[src] - Not sent to non-trustworthy same-site destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpSameSite']),
+        'img',
+        'srcset',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - img[srcset] - Not sent to non-trustworthy same-site destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpSameSite']),
+        'source',
+        'srcset',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - source[srcset] - Not sent to non-trustworthy same-site destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpCrossSite']),
+        'img',
+        'src',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - img[src] - Not sent to non-trustworthy cross-site destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpCrossSite']),
+        'img',
+        'srcset',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - img[srcset] - Not sent to non-trustworthy cross-site destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpCrossSite']),
+        'source',
+        'srcset',
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - source[srcset] - Not sent to non-trustworthy cross-site destination, no attributes');
+
   promise_test(() => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-script.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-script.https.sub.html
index dcdcba2792d..e52b165b747 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-script.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-script.https.sub.html
@@ -589,5 +589,36 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user - no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpsCrossSite'], { mime: 'application/javascript' }
+    );
+
+    return induceRequest(url,
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access - Cross-site, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpsSameSite'], { mime: 'application/javascript' }
+    );
+
+    return induceRequest(url,
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site, no attributes');
   </script>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-script.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-script.sub.html
index a2526698fbd..47ed5fa9f8f 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-script.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-script.sub.html
@@ -391,6 +391,96 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination, attributes: type=module');
 
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpOrigin'], { mime: 'application/javascript' }
+    );
+
+    return induceRequest(url,
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpOrigin'], { mime: 'application/javascript' }
+    );
+
+    return induceRequest(url,
+        {"type": "module"}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination, attributes: type=module');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpSameSite'], { mime: 'application/javascript' }
+    );
+
+    return induceRequest(url,
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpSameSite'], { mime: 'application/javascript' }
+    );
+
+    return induceRequest(url,
+        {"type": "module"}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination, attributes: type=module');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpCrossSite'], { mime: 'application/javascript' }
+    );
+
+    return induceRequest(url,
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpCrossSite'], { mime: 'application/javascript' }
+    );
+
+    return induceRequest(url,
+        {"type": "module"}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination, attributes: type=module');
+
   promise_test(() => {
     const key = '{{uuid()}}';
     const url = makeRequestURL(
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-video-poster.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-video-poster.https.sub.html
index 5805b46bd0c..ddd870af7c2 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-video-poster.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-video-poster.https.sub.html
@@ -238,6 +238,27 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
       });
   }, 'sec-fetch-user');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(t, makeRequestURL(key, ['httpsCrossSite'], params))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+      });
+  }, 'sec-fetch-storage-access - Cross-site');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(t, makeRequestURL(key, ['httpsSameSite'], params))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Same site');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-video-poster.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-video-poster.sub.html
index e6cc5ee7e06..aeb3d4f9b5e 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-video-poster.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-video-poster.sub.html
@@ -162,6 +162,36 @@ Sources:
       });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination');
 
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(t, makeRequestURL(key, ['httpOrigin'], params))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(t, makeRequestURL(key, ['httpSameSite'], params))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(t, makeRequestURL(key, ['httpCrossSite'], params))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination');
+
   promise_test((t) => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-video.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-video.https.sub.html
index 971360dceea..c900807820c 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-video.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-video.https.sub.html
@@ -320,6 +320,33 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user - no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsCrossSite']),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access - Cross-site, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsSameSite']),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site, no attributes');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/element-video.sub.html b/tests/wpt/tests/fetch/metadata/generated/element-video.sub.html
index 9707413ab68..bf357e9da0e 100644
--- a/tests/wpt/tests/fetch/metadata/generated/element-video.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/element-video.sub.html
@@ -184,6 +184,45 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination, no attributes');
 
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpOrigin']),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpSameSite']),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination, no attributes');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpCrossSite']),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination, no attributes');
+
   promise_test(() => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/fetch-via-serviceworker.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/fetch-via-serviceworker.https.sub.html
index 22f930960d6..c3b0599b9da 100644
--- a/tests/wpt/tests/fetch/metadata/generated/fetch-via-serviceworker.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/fetch-via-serviceworker.https.sub.html
@@ -678,6 +678,68 @@ Sources:
         });
   }, 'sec-fetch-user - no init - fallback');
 
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        t,
+        makeRequestURL(key, ['httpsCrossSite']),
+        {"credentials": "include", "mode": "no-cors"},
+        'respondWith'
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access - Cross-site, init: mode=no-cors, credentials=include - respondWith');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        t,
+        makeRequestURL(key, ['httpsCrossSite']),
+        {"credentials": "include", "mode": "no-cors"},
+        'fallback'
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access - Cross-site, init: mode=no-cors, credentials=include - fallback');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        t,
+        makeRequestURL(key, ['httpsSameSite']),
+        {"credentials": "include", "mode": "no-cors"},
+        'respondWith'
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site, init: mode=no-cors, credentials=include - respondWith');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        t,
+        makeRequestURL(key, ['httpsSameSite']),
+        {"credentials": "include", "mode": "no-cors"},
+        'fallback'
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site, init: mode=no-cors, credentials=include - fallback');
+
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/fetch.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/fetch.https.sub.html
index dde1daede4e..486f404d4bd 100644
--- a/tests/wpt/tests/fetch/metadata/generated/fetch.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/fetch.https.sub.html
@@ -297,6 +297,33 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user - no init');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsCrossSite']),
+        {"credentials": "include", "mode": "no-cors"}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access - Cross-site, init: mode=no-cors, credentials=include');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsSameSite']),
+        {"credentials": "include", "mode": "no-cors"}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site, init: mode=no-cors, credentials=include');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/fetch.sub.html b/tests/wpt/tests/fetch/metadata/generated/fetch.sub.html
index d28ea9bb900..7d9536efcfb 100644
--- a/tests/wpt/tests/fetch/metadata/generated/fetch.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/fetch.sub.html
@@ -175,6 +175,45 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination, no init');
 
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpOrigin']),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination, no init');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpSameSite']),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination, no init');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpCrossSite']),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination, no init');
+
   promise_test(() => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/form-submission.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/form-submission.https.sub.html
index 988b07c74a9..0935f846111 100644
--- a/tests/wpt/tests/fetch/metadata/generated/form-submission.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/form-submission.https.sub.html
@@ -517,6 +517,50 @@ Sources:
           assert_array_equals(headers['sec-fetch-user'], ['?1']);
         });
   }, 'sec-fetch-user - POST with user activation');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsCrossSite'], responseParams);
+    const userActivated = false;
+    return induceRequest('GET', url, userActivated)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Cross-site - GET');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsCrossSite'], responseParams);
+    const userActivated = false;
+    return induceRequest('POST', url, userActivated)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Cross-site - POST');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsSameSite'], responseParams);
+    const userActivated = false;
+    return induceRequest('GET', url, userActivated)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site - GET');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsSameSite'], responseParams);
+    const userActivated = false;
+    return induceRequest('POST', url, userActivated)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site - POST');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/form-submission.sub.html b/tests/wpt/tests/fetch/metadata/generated/form-submission.sub.html
index f862062aebc..b0f56f60942 100644
--- a/tests/wpt/tests/fetch/metadata/generated/form-submission.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/form-submission.sub.html
@@ -326,6 +326,72 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination - POST');
 
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpOrigin'], responseParams);
+    const userActivated = false;
+    return induceRequest('GET', url, userActivated)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - GET');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpOrigin'], responseParams);
+    const userActivated = false;
+    return induceRequest('POST', url, userActivated)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - POST');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpSameSite'], responseParams);
+    const userActivated = false;
+    return induceRequest('GET', url, userActivated)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - GET');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpSameSite'], responseParams);
+    const userActivated = false;
+    return induceRequest('POST', url, userActivated)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - POST');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpCrossSite'], responseParams);
+    const userActivated = false;
+    return induceRequest('GET', url, userActivated)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - GET');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpCrossSite'], responseParams);
+    const userActivated = false;
+    return induceRequest('POST', url, userActivated)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - POST');
+
   promise_test(() => {
     const key = '{{uuid()}}';
     const url = makeRequestURL(key, ['httpsOrigin', 'httpOrigin'], responseParams);
diff --git a/tests/wpt/tests/fetch/metadata/generated/header-link.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/header-link.https.sub.html
index 09f01138955..8e7d029dc25 100644
--- a/tests/wpt/tests/fetch/metadata/generated/header-link.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/header-link.https.sub.html
@@ -524,6 +524,64 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user rel=stylesheet');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsCrossSite'], {mime: 'text/html'}),
+        'icon',
+        t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access rel=icon - Cross-site');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsCrossSite'], {mime: 'text/html'}),
+        'stylesheet',
+        t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access rel=stylesheet - Cross-site');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsSameSite'], {mime: 'text/html'}),
+        'icon',
+        t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access rel=icon - Same site');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsSameSite'], {mime: 'text/html'}),
+        'stylesheet',
+        t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access rel=stylesheet - Same site');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/header-link.sub.html b/tests/wpt/tests/fetch/metadata/generated/header-link.sub.html
index 8b6cdae0eda..b0823071345 100644
--- a/tests/wpt/tests/fetch/metadata/generated/header-link.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/header-link.sub.html
@@ -368,6 +368,90 @@ Sources:
         });
   }, 'sec-fetch-user rel=stylesheet - Not sent to non-trustworthy cross-site destination');
 
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpOrigin'], {mime: 'text/html'}),
+        'icon',
+        t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access rel=icon - Not sent to non-trustworthy same-origin destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpOrigin'], {mime: 'text/html'}),
+        'stylesheet',
+        t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access rel=stylesheet - Not sent to non-trustworthy same-origin destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpSameSite'], {mime: 'text/html'}),
+        'icon',
+        t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access rel=icon - Not sent to non-trustworthy same-site destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpSameSite'], {mime: 'text/html'}),
+        'stylesheet',
+        t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access rel=stylesheet - Not sent to non-trustworthy same-site destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpCrossSite'], {mime: 'text/html'}),
+        'icon',
+        t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access rel=icon - Not sent to non-trustworthy cross-site destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpCrossSite'], {mime: 'text/html'}),
+        'stylesheet',
+        t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access rel=stylesheet - Not sent to non-trustworthy cross-site destination');
+
   promise_test((t) => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/header-refresh.https.optional.sub.html b/tests/wpt/tests/fetch/metadata/generated/header-refresh.https.optional.sub.html
index e63ee423cd7..0f7e9e42b79 100644
--- a/tests/wpt/tests/fetch/metadata/generated/header-refresh.https.optional.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/header-refresh.https.optional.sub.html
@@ -268,6 +268,30 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsCrossSite'], responseParams), t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Cross-site');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpsSameSite'], responseParams), t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/header-refresh.optional.sub.html b/tests/wpt/tests/fetch/metadata/generated/header-refresh.optional.sub.html
index 4674ada9c6d..873013e821c 100644
--- a/tests/wpt/tests/fetch/metadata/generated/header-refresh.optional.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/header-refresh.optional.sub.html
@@ -180,6 +180,42 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination');
 
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpOrigin'], responseParams), t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpSameSite'], responseParams), t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(key, ['httpCrossSite'], responseParams), t
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination');
+
   promise_test((t) => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/script-module-import-dynamic.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/script-module-import-dynamic.https.sub.html
index 72d60fc30cb..94ef41b9228 100644
--- a/tests/wpt/tests/fetch/metadata/generated/script-module-import-dynamic.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/script-module-import-dynamic.https.sub.html
@@ -250,5 +250,31 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpsCrossSite'], { mime: 'application/javascript' }
+    );
+
+    return import(url)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Cross-site');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpsSameSite'], { mime: 'application/javascript' }
+    );
+
+    return import(url)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site');
   </script>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/script-module-import-dynamic.sub.html b/tests/wpt/tests/fetch/metadata/generated/script-module-import-dynamic.sub.html
index 088720c23e0..16aefa11176 100644
--- a/tests/wpt/tests/fetch/metadata/generated/script-module-import-dynamic.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/script-module-import-dynamic.sub.html
@@ -170,6 +170,45 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination');
 
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpOrigin'], { mime: 'application/javascript' }
+    );
+
+    return import(url)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpSameSite'], { mime: 'application/javascript' }
+    );
+
+    return import(url)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpCrossSite'], { mime: 'application/javascript' }
+    );
+
+    return import(url)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination');
+
   promise_test(() => {
     const key = '{{uuid()}}';
     const url = makeRequestURL(
diff --git a/tests/wpt/tests/fetch/metadata/generated/script-module-import-static.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/script-module-import-static.https.sub.html
index cea3464f807..62968f318f5 100644
--- a/tests/wpt/tests/fetch/metadata/generated/script-module-import-static.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/script-module-import-static.https.sub.html
@@ -284,5 +284,33 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(
+          key, ['httpsCrossSite'], { mime: 'application/javascript' }
+        )
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Cross-site');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(
+          key, ['httpsSameSite'], { mime: 'application/javascript' }
+        )
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site');
   </script>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/script-module-import-static.sub.html b/tests/wpt/tests/fetch/metadata/generated/script-module-import-static.sub.html
index 0f94f71cf6f..c4da1576606 100644
--- a/tests/wpt/tests/fetch/metadata/generated/script-module-import-static.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/script-module-import-static.sub.html
@@ -199,6 +199,48 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination');
 
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(
+          key, ['httpOrigin'], { mime: 'application/javascript' }
+        )
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(
+          key, ['httpSameSite'], { mime: 'application/javascript' }
+        )
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        makeRequestURL(
+          key, ['httpCrossSite'], { mime: 'application/javascript' }
+        )
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination');
+
   promise_test(() => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/svg-image.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/svg-image.https.sub.html
index b059eb31456..9dd0da15f9d 100644
--- a/tests/wpt/tests/fetch/metadata/generated/svg-image.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/svg-image.https.sub.html
@@ -362,6 +362,35 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
       });
   }, 'sec-fetch-user no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        t,
+        makeRequestURL(key, ['httpsCrossSite'], params),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+      });
+  }, 'sec-fetch-storage-access - Cross-site no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        t,
+        makeRequestURL(key, ['httpsSameSite'], params),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Same site no attributes');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/svg-image.sub.html b/tests/wpt/tests/fetch/metadata/generated/svg-image.sub.html
index a28bbb12eb7..56427bedaa6 100644
--- a/tests/wpt/tests/fetch/metadata/generated/svg-image.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/svg-image.sub.html
@@ -217,6 +217,48 @@ Sources:
       });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination no attributes');
 
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        t,
+        makeRequestURL(key, ['httpOrigin'], params),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        t,
+        makeRequestURL(key, ['httpSameSite'], params),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination no attributes');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+
+    return induceRequest(
+        t,
+        makeRequestURL(key, ['httpCrossSite'], params),
+        {}
+      )
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+      });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination no attributes');
+
   promise_test((t) => {
     const key = '{{uuid()}}';
 
diff --git a/tests/wpt/tests/fetch/metadata/generated/window-history.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/window-history.https.sub.html
index c2b3079a6d3..64e282e7789 100644
--- a/tests/wpt/tests/fetch/metadata/generated/window-history.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/window-history.https.sub.html
@@ -232,6 +232,50 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user - history.forward');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsCrossSite'], responseParams);
+
+    return induceBackRequest(url, t, () => retrieve(key))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Cross-site - history.back');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsCrossSite'], responseParams);
+
+    return induceForwardRequest(url, t, () => retrieve(key))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Cross-site - history.forward');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsSameSite'], responseParams);
+
+    return induceBackRequest(url, t, () => retrieve(key))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site - history.back');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsSameSite'], responseParams);
+
+    return induceForwardRequest(url, t, () => retrieve(key))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site - history.forward');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/window-history.sub.html b/tests/wpt/tests/fetch/metadata/generated/window-history.sub.html
index 333d90c2860..83670496477 100644
--- a/tests/wpt/tests/fetch/metadata/generated/window-history.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/window-history.sub.html
@@ -355,6 +355,72 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination - history.forward');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpOrigin'], responseParams);
+
+    return induceBackRequest(url, t, () => retrieve(key))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - history.back');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpOrigin'], responseParams);
+
+    return induceForwardRequest(url, t, () => retrieve(key))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - history.forward');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpSameSite'], responseParams);
+
+    return induceBackRequest(url, t, () => retrieve(key))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - history.back');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpSameSite'], responseParams);
+
+    return induceForwardRequest(url, t, () => retrieve(key))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - history.forward');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpCrossSite'], responseParams);
+
+    return induceBackRequest(url, t, () => retrieve(key))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - history.back');
+
+  promise_test((t) => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpCrossSite'], responseParams);
+
+    return induceForwardRequest(url, t, () => retrieve(key))
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - history.forward');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/window-location.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/window-location.https.sub.html
index 4a0d2fdc068..387039bcf25 100644
--- a/tests/wpt/tests/fetch/metadata/generated/window-location.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/window-location.https.sub.html
@@ -1179,6 +1179,118 @@ Sources:
           assert_array_equals(headers['sec-fetch-user'], ['?1']);
         });
   }, 'sec-fetch-user - location.replace with user activation');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsCrossSite'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location = path;
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Cross-site - location');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsCrossSite'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location.href = path;
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Cross-site - location.href');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsCrossSite'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location.assign(path);
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Cross-site - location.assign');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsCrossSite'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location.replace(path);
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Cross-site - location.replace');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsSameSite'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location = path;
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site - location');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsSameSite'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location.href = path;
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site - location.href');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsSameSite'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location.assign(path);
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site - location.assign');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpsSameSite'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location.replace(path);
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site - location.replace');
   </script>
   </body>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/window-location.sub.html b/tests/wpt/tests/fetch/metadata/generated/window-location.sub.html
index bb3e6805cb0..e307b909dce 100644
--- a/tests/wpt/tests/fetch/metadata/generated/window-location.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/window-location.sub.html
@@ -714,6 +714,174 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination - location.replace');
 
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpOrigin'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location = path;
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - location');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpOrigin'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location.href = path;
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - location.href');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpOrigin'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location.assign(path);
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - location.assign');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpOrigin'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location.replace(path);
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination - location.replace');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpSameSite'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location = path;
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - location');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpSameSite'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location.href = path;
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - location.href');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpSameSite'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location.assign(path);
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - location.assign');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpSameSite'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location.replace(path);
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination - location.replace');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpCrossSite'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location = path;
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - location');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpCrossSite'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location.href = path;
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - location.href');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpCrossSite'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location.assign(path);
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - location.assign');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(key, ['httpCrossSite'], responseParams);
+
+    const navigate = (win, path) => {
+      win.location.replace(path);
+    };
+    return induceRequest(url, navigate, false)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination - location.replace');
+
   promise_test(() => {
     const key = '{{uuid()}}';
     const url = makeRequestURL(key, ['httpsOrigin', 'httpOrigin'], responseParams);
diff --git a/tests/wpt/tests/fetch/metadata/generated/worker-dedicated-constructor.sub.html b/tests/wpt/tests/fetch/metadata/generated/worker-dedicated-constructor.sub.html
index 65b1837c636..e05e12df395 100644
--- a/tests/wpt/tests/fetch/metadata/generated/worker-dedicated-constructor.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/worker-dedicated-constructor.sub.html
@@ -80,5 +80,20 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy same-origin destination, no options');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key,
+      ['httpOrigin'],
+      { mime: 'application/javascript', body: 'postMessage("")' }
+    );
+
+    return induceRequest(url)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination, no options');
   </script>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/worker-dedicated-importscripts.https.sub.html b/tests/wpt/tests/fetch/metadata/generated/worker-dedicated-importscripts.https.sub.html
index 0cd9f35d582..5b48e59e716 100644
--- a/tests/wpt/tests/fetch/metadata/generated/worker-dedicated-importscripts.https.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/worker-dedicated-importscripts.https.sub.html
@@ -264,5 +264,32 @@ Sources:
           assert_not_own_property(headers, 'sec-fetch-user');
         });
   }, 'sec-fetch-user');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpsCrossSite'], { mime: 'application/javascript' }
+    );
+
+    return induceRequest(url)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_own_property(headers, 'sec-fetch-storage-access');
+          assert_array_equals(headers['sec-fetch-storage-access'], ['none']);
+        });
+  }, 'sec-fetch-storage-access - Cross-site');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpsSameSite'], { mime: 'application/javascript' }
+    );
+
+    return induceRequest(url)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Same site');
   </script>
 </html>
diff --git a/tests/wpt/tests/fetch/metadata/generated/worker-dedicated-importscripts.sub.html b/tests/wpt/tests/fetch/metadata/generated/worker-dedicated-importscripts.sub.html
index 0555bbaf432..ad4792b8a60 100644
--- a/tests/wpt/tests/fetch/metadata/generated/worker-dedicated-importscripts.sub.html
+++ b/tests/wpt/tests/fetch/metadata/generated/worker-dedicated-importscripts.sub.html
@@ -184,6 +184,45 @@ Sources:
         });
   }, 'sec-fetch-user - Not sent to non-trustworthy cross-site destination');
 
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpOrigin'], { mime: 'application/javascript' }
+    );
+
+    return induceRequest(url)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-origin destination');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpSameSite'], { mime: 'application/javascript' }
+    );
+
+    return induceRequest(url)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy same-site destination');
+
+  promise_test(() => {
+    const key = '{{uuid()}}';
+    const url = makeRequestURL(
+      key, ['httpCrossSite'], { mime: 'application/javascript' }
+    );
+
+    return induceRequest(url)
+      .then(() => retrieve(key))
+      .then((headers) => {
+          assert_not_own_property(headers, 'sec-fetch-storage-access');
+        });
+  }, 'sec-fetch-storage-access - Not sent to non-trustworthy cross-site destination');
+
   promise_test(() => {
     const key = '{{uuid()}}';
     const url = makeRequestURL(
diff --git a/tests/wpt/tests/fetch/metadata/tools/fetch-metadata.conf.yml b/tests/wpt/tests/fetch/metadata/tools/fetch-metadata.conf.yml
index b96bd2fd7b4..bc764aed02d 100644
--- a/tests/wpt/tests/fetch/metadata/tools/fetch-metadata.conf.yml
+++ b/tests/wpt/tests/fetch/metadata/tools/fetch-metadata.conf.yml
@@ -42,6 +42,15 @@ cases:
       - headerName: sec-fetch-user
         origins: [httpCrossSite]
         description: Not sent to non-trustworthy cross-site destination
+      - headerName: sec-fetch-storage-access
+        origins: [httpOrigin]
+        description: Not sent to non-trustworthy same-origin destination
+      - headerName: sec-fetch-storage-access
+        origins: [httpSameSite]
+        description: Not sent to non-trustworthy same-site destination
+      - headerName: sec-fetch-storage-access
+        origins: [httpCrossSite]
+        description: Not sent to non-trustworthy cross-site destination
     template_axes:
       # The `AudioWorklet` interface is only available in secure contexts
       # https://webaudio.github.io/web-audio-api/#AudioWorklet
@@ -109,6 +118,9 @@ cases:
       - headerName: sec-fetch-user
         origins: [httpOrigin]
         description: Not sent to non-trustworthy same-origin destination
+      - headerName: sec-fetch-storage-access
+        origins: [httpOrigin]
+        description: Not sent to non-trustworthy same-origin destination
     template_axes:
       # All the templates in this block are unused with the exception of
       # `worker-dedicated-constructor`
@@ -848,3 +860,72 @@ cases:
           expected: NULL
       worker-dedicated-importscripts.sub.html:
         - expected: NULL
+  # Sec-Fetch-Storage-Access
+  - all_subtests:
+      headerName: sec-fetch-storage-access
+      filename_flags: [https]
+    common_axis:
+        - description: Cross-site
+          origins: [httpsCrossSite]
+          expected: none
+        - description: Same site
+          origins: [httpsSameSite]
+          expected: NULL
+    template_axes:
+      # Service Workers' redirect mode is "error"
+      serviceworker.https.sub.html: [{}]
+      # Interstitial locations in an HTTP redirect chain are not added to the
+      # session history, so these requests cannot be initiated using the
+      # History API.
+      css-images.sub.html:
+        - filename_flags: [tentative]
+      element-audio.sub.html: [{}]
+      element-embed.sub.html: [{}]
+      element-frame.sub.html: [{}]
+      element-iframe.sub.html: [{}]
+      element-img.sub.html:
+        - sourceAttr: src
+        - sourceAttr: srcset
+      element-img-environment-change.sub.html: [{}]
+      element-input-image.sub.html: [{}]
+      element-link-icon.sub.html: [{}]
+      element-link-prefetch.optional.sub.html: [{}]
+      element-picture.sub.html: [{}]
+      element-script.sub.html: [{}]
+      element-video.sub.html: [{}]
+      element-video-poster.sub.html: [{}]
+      fetch.sub.html: [{ init: { mode: no-cors , credentials: include }  }]
+      fetch-via-serviceworker.https.sub.html: [{ init: { mode: no-cors , credentials: include } }]
+      header-link.sub.html:
+        - rel: icon
+        - rel: stylesheet
+      svg-image.sub.html: [{}]
+      worker-dedicated-constructor.sub.html: []
+      worker-dedicated-importscripts.sub.html: [{}]
+  # The following are cases where the Sec-Fetch-Storage-Access header should
+  # not be attached at all.
+  - all_subtests:
+      headerName: sec-fetch-storage-access
+      filename_flags: [https]
+    common_axis:
+        - description: Cross-site
+          origins: [httpsCrossSite]
+          expected: NULL
+        - description: Same site
+          origins: [httpsSameSite]
+          expected: NULL
+    template_axes:
+      audioworklet.https.sub.html: [{}]
+      css-font-face.sub.html:
+        - filename_flags: [tentative]
+      element-meta-refresh.optional.sub.html: [{}]
+      element-a.sub.html: [{}]
+      element-area.sub.html: [{}]
+      form-submission.sub.html:
+        - method: GET
+        - method: POST
+      header-refresh.optional.sub.html: [{}]
+      script-module-import-dynamic.sub.html: [{}]
+      script-module-import-static.sub.html: [{}]
+      window-history.sub.html: [{}]
+      window-location.sub.html: [{}]
diff --git a/tests/wpt/tests/fledge/tentative/resources/ba-fledge-util.sub.js b/tests/wpt/tests/fledge/tentative/resources/ba-fledge-util.sub.js
index d981e6a056e..3aef43d70d6 100644
--- a/tests/wpt/tests/fledge/tentative/resources/ba-fledge-util.sub.js
+++ b/tests/wpt/tests/fledge/tentative/resources/ba-fledge-util.sub.js
@@ -256,11 +256,11 @@ BA.decodeInterestGroupData = async function(igData) {
   // Only version 0 in use now.
   assert_equals(header.version, 0);
 
-  // Test config uses keyId = 0x12 only
+  // Test config uses keyId = 0x14 only
   // If the feature is not set up properly we may get a different, non-test key.
   // We can't use assert_equals because it includes the (random) non-test key
   // in the error message if testing support for this feature is not present.
-  assert_true(header.keyId === 0x12, "valid key Id");
+  assert_true(header.keyId === 0x14, "valid key Id");
 
   // Current cipher config.
   assert_equals(header.kemId, hpke.KemId.DhkemX25519HkdfSha256);
diff --git a/tests/wpt/tests/fledge/tentative/resources/ba-public-keys b/tests/wpt/tests/fledge/tentative/resources/ba-public-keys
index 60580a74d06..32b1c1babe5 100644
--- a/tests/wpt/tests/fledge/tentative/resources/ba-public-keys
+++ b/tests/wpt/tests/fledge/tentative/resources/ba-public-keys
@@ -1 +1 @@
-{"keys":[{"id":"12345678-9abc-def0-1234-56789abcdef0","key":"oV9AZYb6xHuZWXDxhdnYkcdNzx65Gn1QpYsBaD5gBS0="}]}
+{"keys":[{"id":"14345678-9abc-def0-1234-56789abcdef0","key":"oV9AZYb6xHuZWXDxhdnYkcdNzx65Gn1QpYsBaD5gBS0="}]}
diff --git a/tests/wpt/tests/fullscreen/crashtests/chrome-1312699.html b/tests/wpt/tests/fullscreen/crashtests/chrome-1312699.html
new file mode 100644
index 00000000000..c783b0d9cc9
--- /dev/null
+++ b/tests/wpt/tests/fullscreen/crashtests/chrome-1312699.html
@@ -0,0 +1,21 @@
+<!doctype html>
+<html class="reftest-wait">
+<link rel="help" href="https://crbug.com/1312699">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<video></video>
+<script>
+  async function crash() {
+    let video = document.querySelector("video");
+    await video.requestFullscreen();
+    video.width = null;
+    document.documentElement.classList.remove("reftest-wait");
+  }
+  document.addEventListener("click", () => crash(), false);
+
+  requestAnimationFrame(() => requestAnimationFrame(() => {
+    test_driver.click(document.body);
+  }));
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/fullscreen/crashtests/content-visibility-crash.html b/tests/wpt/tests/fullscreen/crashtests/content-visibility-crash.html
new file mode 100644
index 00000000000..63111d03e3f
--- /dev/null
+++ b/tests/wpt/tests/fullscreen/crashtests/content-visibility-crash.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html class=test-wait>
+<link rel=author href="mailto:m.cooolie@gmail.com">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://bugs.chromium.org/p/chromium/issues/detail?id=1338135">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<body>
+<script>
+async function crash() {
+  const col = document.createElement("col");
+  document.body.appendChild(col);
+
+  let fullscreenPromise = null;
+  await test_driver.bless('open fullscreen', () => {
+    fullscreenPromise = col.requestFullscreen({navigationUI: 'hide'});
+  });
+  await fullscreenPromise;
+
+  const a = document.createElement("a");
+  document.body.appendChild(a);
+
+  document.body.style.all = 'unset';
+  document.body.style.contentVisibility = 'hidden';
+
+  a.offsetParent;
+
+  document.documentElement.classList.remove('test-wait');
+}
+crash();
+</script>
diff --git a/tests/wpt/tests/fullscreen/rendering/backdrop-green-ref.html b/tests/wpt/tests/fullscreen/rendering/backdrop-green-ref.html
new file mode 100644
index 00000000000..3126fe19426
--- /dev/null
+++ b/tests/wpt/tests/fullscreen/rendering/backdrop-green-ref.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<body style="background: green"></body>
diff --git a/tests/wpt/tests/fullscreen/rendering/backdrop-iframe.html b/tests/wpt/tests/fullscreen/rendering/backdrop-iframe.html
new file mode 100644
index 00000000000..dbdf9c841a4
--- /dev/null
+++ b/tests/wpt/tests/fullscreen/rendering/backdrop-iframe.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<title>::backdrop for a fullscreen iframe element</title>
+<link rel=match href="backdrop-green-ref.html">
+<link rel=help href="https://github.com/w3c/csswg-drafts/issues/6939">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+iframe::backdrop {
+  background: green;
+}
+</style>
+<iframe></iframe>
+<script>
+document.addEventListener('fullscreenchange', () => {
+  document.documentElement.classList.remove('reftest-wait');
+});
+test_driver.bless('fullscreen', () => {
+  document.querySelector('iframe').requestFullscreen();
+});
+</script>
diff --git a/tests/wpt/tests/fullscreen/rendering/backdrop-inherit.html b/tests/wpt/tests/fullscreen/rendering/backdrop-inherit.html
new file mode 100644
index 00000000000..3a38dc4c815
--- /dev/null
+++ b/tests/wpt/tests/fullscreen/rendering/backdrop-inherit.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<title>::backdrop inherits style from the fullscreen element</title>
+<link rel=match href="backdrop-green-ref.html">
+<link rel=help href="https://github.com/whatwg/fullscreen/issues/124">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+body {
+  --bg: red;
+}
+div {
+  --bg: green;
+}
+div::backdrop {
+  background: var(--bg);
+}
+</style>
+<div></div>
+<script>
+document.addEventListener('fullscreenchange', () => {
+  document.documentElement.classList.remove('reftest-wait');
+});
+test_driver.bless('fullscreen', () => {
+  document.querySelector('div').requestFullscreen();
+});
+</script>
diff --git a/tests/wpt/tests/fullscreen/rendering/backdrop-object-ref.html b/tests/wpt/tests/fullscreen/rendering/backdrop-object-ref.html
new file mode 100644
index 00000000000..6c7071a727d
--- /dev/null
+++ b/tests/wpt/tests/fullscreen/rendering/backdrop-object-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<style>
+body {
+    background: blue;
+    margin: 0;
+}
+div {
+    position: fixed;
+    width: 100px;
+    height: 100px;
+    background: green;
+}
+</style>
+<div></div>
diff --git a/tests/wpt/tests/fullscreen/rendering/backdrop-object.html b/tests/wpt/tests/fullscreen/rendering/backdrop-object.html
new file mode 100644
index 00000000000..01dc913a50d
--- /dev/null
+++ b/tests/wpt/tests/fullscreen/rendering/backdrop-object.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<title>::backdrop for a fullscreen object element</title>
+<link rel=match href="backdrop-object-ref.html">
+<link rel=help href="https://github.com/w3c/csswg-drafts/issues/6939">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+object::backdrop {
+  background: blue;
+}
+</style>
+<object width="200" type="image/svg+xml" data="/images/100px-green-rect.svg"></object>
+<script>
+const object = document.querySelector("object");
+Promise.all([
+    new Promise((resolve, reject) => document.addEventListener("fullscreenchange", resolve)),
+    new Promise((resolve, reject) => object.addEventListener("load", resolve))
+]).then(() => document.documentElement.classList.remove('reftest-wait'));
+
+test_driver.bless('fullscreen', () => object.requestFullscreen());
+</script>
diff --git a/tests/wpt/tests/fullscreen/rendering/fullscreen-root-fills-page-ref.html b/tests/wpt/tests/fullscreen/rendering/fullscreen-root-fills-page-ref.html
new file mode 100644
index 00000000000..b2bf13557a2
--- /dev/null
+++ b/tests/wpt/tests/fullscreen/rendering/fullscreen-root-fills-page-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <style>
+        html, body {
+            width: 100%;
+            height: 100%;
+            margin: 0;
+            padding: 0;
+        }
+
+        body {
+            background-color: green;
+        }
+    </style>
+</head>
+<body></body>
+</html>
diff --git a/tests/wpt/tests/fullscreen/rendering/fullscreen-root-fills-page.html b/tests/wpt/tests/fullscreen/rendering/fullscreen-root-fills-page.html
new file mode 100644
index 00000000000..e2a6217346d
--- /dev/null
+++ b/tests/wpt/tests/fullscreen/rendering/fullscreen-root-fills-page.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<head>
+    <link rel="author" title="Tim Nguyen" href="https://github.com/nt1m">
+    <link rel="match" href="fullscreen-root-fills-page-ref.html">
+    <style>
+        html {
+            background-color: red;
+            height: 100%;
+            overflow: hidden;
+
+            /* These should be no-op */
+            top: 200px;
+            left: 200px;
+            right: 200px;
+            bottom: 200px;
+        }
+
+        html, body {
+            margin: 0;
+            padding: 0;
+        }
+
+        body, #cover {
+            height: 100%;
+            width: 100%;
+        }
+
+        #cover {
+            background-color: green;
+        }
+    </style>
+</head>
+
+<body>
+    <div id="cover"></div>
+    <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
+    <script>
+        document.addEventListener("fullscreenchange", () => {
+            document.documentElement.classList.remove("reftest-wait");
+        });
+        test_driver.bless("fullscreen")
+            .then(() => document.documentElement.requestFullscreen())
+    </script>
+</body>
+</html>
diff --git a/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/named-lookup-scoped-to-browsing-context-group.html b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/named-lookup-scoped-to-browsing-context-group.html
new file mode 100644
index 00000000000..0450d479196
--- /dev/null
+++ b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/named-lookup-scoped-to-browsing-context-group.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<title>Named lookup scoped to browsing context group</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+
+<body>
+<script>
+
+promise_test(async t => {
+  const rcHelper = new RemoteContextHelper();
+  // This test harness cannot be in the same browsing context group as the
+  // popup.
+  const rcPopup1 = await rcHelper.addWindow(undefined, { features: 'noopener' });
+
+  await rcPopup1.executeScript(() => {
+    window.name = 'my_popup';
+    window.firstPopup = true;
+  });
+  assert_equals(window.open('', 'my_popup').firstPopup, undefined,
+                'cannot lookup across browsing context groups');
+}, 'named lookup scoped to browsing context group');
+
+</script>
+</body>
diff --git a/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/no-proactive-swap-when-other-contexts-in-group.html b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/no-proactive-swap-when-other-contexts-in-group.html
new file mode 100644
index 00000000000..5f4e0da690b
--- /dev/null
+++ b/tests/wpt/tests/html/browsers/windows/auxiliary-browsing-contexts/no-proactive-swap-when-other-contexts-in-group.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<title>No proactive browsing context group changes when other contexts in group</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+
+<body>
+<script>
+
+promise_test(async t => {
+  const rcHelper = new RemoteContextHelper();
+  const rcPopup1 = await rcHelper.addWindow(undefined, { target: 'my_popup' });
+
+  await rcPopup1.executeScript(() => {
+    window.intendedTarget1 = true;
+  });
+  assert_true(window.open('', 'my_popup').intendedTarget1,
+              'lookup by name');
+
+  // There is no security reason (e.g. COOP) to change browsing context groups
+  // for this navigation. Some implementations perform BCG swaps for performance
+  // reasons, but they cannot do so in this case, as this test harness page and
+  // the popup are in the same browsing context group.
+  const rcPopup2 = await rcPopup1.navigateToNew();
+
+  // In order to find the popup by name, the popup and this opener must be in
+  // the same browsing context group.
+  await rcPopup2.executeScript(() => {
+    window.intendedTarget2 = true;
+  });
+  assert_true(window.open('', 'my_popup').intendedTarget2,
+              'lookup by name after navigation');
+}, 'no proactive browsing context group change when other contexts in group');
+
+</script>
+</body>
diff --git a/tests/wpt/tests/html/browsers/windows/browsing-context-names/duplicate-name-order.html b/tests/wpt/tests/html/browsers/windows/browsing-context-names/duplicate-name-order.html
new file mode 100644
index 00000000000..95b461d4edd
--- /dev/null
+++ b/tests/wpt/tests/html/browsers/windows/browsing-context-names/duplicate-name-order.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<title>Duplicate name lookup order</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+
+<body>
+<script>
+
+promise_test(async t => {
+  const rcHelper = new RemoteContextHelper();
+  const rcMain = await rcHelper.addWindow();
+
+  const rcPopupA = await rcHelper.addWindow(undefined, { target: 'A' });
+  const rcPopupB = await rcHelper.addWindow(undefined, { target: 'B' });
+  const rcPopupC = await rcHelper.addWindow(undefined, { target: 'C' });
+
+  const rcSiblingA = await rcMain.addIframe(undefined, { name: 'A' });
+  const rcSiblingB = await rcMain.addIframe(undefined, { name: 'B' });
+
+  const rcRequestor = await rcMain.addIframe();
+
+  const rcChildA = await rcRequestor.addIframe(undefined, { name: 'A' });
+
+  const windowIdentifiers = {
+   'Main': rcMain,
+   'PopupA': rcPopupA,
+   'PopupB': rcPopupB,
+   'PopupC': rcPopupC,
+   'SiblingA': rcSiblingA,
+   'SiblingB': rcSiblingB,
+   'Requestor': rcRequestor,
+   'ChildA': rcChildA,
+  };
+  for (const [windowIdentifier, remote] of Object.entries(windowIdentifiers)) {
+    await remote.executeScript((windowIdentifier) => {
+      window.windowIdentifier = windowIdentifier;
+    }, [windowIdentifier]);
+  }
+
+  function performLookup(targetName) {
+    return rcRequestor.executeScript((targetName) => {
+        return window.open('', targetName).windowIdentifier;
+      }, [targetName]);
+  }
+
+  assert_equals(await performLookup('A'), 'ChildA', 'subtree first');
+  assert_equals(await performLookup('B'), 'SiblingB', 'then the rest of the tree');
+  assert_equals(await performLookup('C'), 'PopupC', 'then other pages');
+}, 'Duplicate name lookup order');
+
+</script>
+</body>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.caret-position-edge-cases.tentative.html b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.caret-position-edge-cases.tentative.html
deleted file mode 100644
index 6628c939468..00000000000
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.caret-position-edge-cases.tentative.html
+++ /dev/null
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<meta charset="UTF-8">
-<title>Canvas test: 2d.text.measure.caret-position-edge-cases.tentative</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/html/canvas/resources/canvas-tests.js"></script>
-<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
-<style>
-@font-face {
-  font-family: CanvasTest;
-  src: url("/fonts/CanvasTest.ttf");
-}
-</style>
-<body class="show_output">
-
-<h1>2d.text.measure.caret-position-edge-cases.tentative</h1>
-<p class="desc">Test the edge cases for caretPositionFromPoint, where the point is at the edge of glyph and at the midpoint.</p>
-
-
-<span style="font-family: CanvasTest; position: absolute; visibility: hidden">A</span>
-<p class="output">Actual output:</p>
-<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
-
-<ul id="d"></ul>
-<script>
-promise_test(async t => {
-
-  var canvas = document.getElementById('c');
-  var ctx = canvas.getContext('2d');
-
-  await document.fonts.ready;
-  ctx.font = '50px CanvasTest';
-  ctx.direction = 'ltr';
-  ctx.align = 'left'
-  ctx.baseline = 'alphabetic'
-  tm = ctx.measureText('A');
-  const a_width = tm.width;
-  tm = ctx.measureText('B');
-  const b_width = tm.width;
-  tm = ctx.measureText('C');
-  const c_width = tm.width;
-  const epsilon = 1.0e-4;
-
-  tm = ctx.measureText('ABC');
-  _assert(tm.caretPositionFromPoint(0) == 0, "tm.caretPositionFromPoint(0) == 0");
-  _assert(tm.caretPositionFromPoint(a_width / 2) == 0, "tm.caretPositionFromPoint(a_width / 2) == 0");
-  _assert(tm.caretPositionFromPoint(a_width / 2 + 1) == 1, "tm.caretPositionFromPoint(a_width / 2 + 1) == 1");
-  _assert(tm.caretPositionFromPoint(a_width) == 1, "tm.caretPositionFromPoint(a_width) == 1");
-  _assert(tm.caretPositionFromPoint(a_width + b_width / 2) == 1, "tm.caretPositionFromPoint(a_width + b_width / 2) == 1");
-  _assert(tm.caretPositionFromPoint(a_width + b_width / 2 + 1) == 2, "tm.caretPositionFromPoint(a_width + b_width / 2 + 1) == 2");
-  _assert(tm.caretPositionFromPoint(a_width + b_width) == 2, "tm.caretPositionFromPoint(a_width + b_width) == 2");
-  _assert(tm.caretPositionFromPoint(a_width + b_width + c_width / 2) == 2, "tm.caretPositionFromPoint(a_width + b_width + c_width / 2) == 2");
-  _assert(tm.caretPositionFromPoint(a_width + b_width + c_width / 2 + 1) == 3, "tm.caretPositionFromPoint(a_width + b_width + c_width / 2 + 1) == 3");
-  _assert(tm.caretPositionFromPoint(a_width + b_width + c_width) == 3, "tm.caretPositionFromPoint(a_width + b_width + c_width) == 3");
-
-}, "Test the edge cases for caretPositionFromPoint, where the point is at the edge of glyph and at the midpoint.");
-</script>
-
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.index-from-offset-edge-cases.tentative.html b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.index-from-offset-edge-cases.tentative.html
new file mode 100644
index 00000000000..b7a327aeaae
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.index-from-offset-edge-cases.tentative.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>Canvas test: 2d.text.measure.index-from-offset-edge-cases.tentative</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
+<style>
+@font-face {
+  font-family: CanvasTest;
+  src: url("/fonts/CanvasTest.ttf");
+}
+</style>
+<body class="show_output">
+
+<h1>2d.text.measure.index-from-offset-edge-cases.tentative</h1>
+<p class="desc">Test the edge cases for getIndexFromOffset, where the point is at the edge of glyph and at the midpoint.</p>
+
+
+<span style="font-family: CanvasTest; position: absolute; visibility: hidden">A</span>
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="50"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  await document.fonts.ready;
+  ctx.font = '50px CanvasTest';
+  ctx.direction = 'ltr';
+  ctx.align = 'left'
+  ctx.baseline = 'alphabetic'
+  tm = ctx.measureText('A');
+  const a_width = tm.width;
+  tm = ctx.measureText('B');
+  const b_width = tm.width;
+  tm = ctx.measureText('C');
+  const c_width = tm.width;
+  const epsilon = 1.0e-4;
+
+  tm = ctx.measureText('ABC');
+  _assert(tm.getIndexFromOffset(0) == 0, "tm.getIndexFromOffset(0) == 0");
+  _assert(tm.getIndexFromOffset(a_width / 2) == 0, "tm.getIndexFromOffset(a_width / 2) == 0");
+  _assert(tm.getIndexFromOffset(a_width / 2 + 1) == 1, "tm.getIndexFromOffset(a_width / 2 + 1) == 1");
+  _assert(tm.getIndexFromOffset(a_width) == 1, "tm.getIndexFromOffset(a_width) == 1");
+  _assert(tm.getIndexFromOffset(a_width + b_width / 2) == 1, "tm.getIndexFromOffset(a_width + b_width / 2) == 1");
+  _assert(tm.getIndexFromOffset(a_width + b_width / 2 + 1) == 2, "tm.getIndexFromOffset(a_width + b_width / 2 + 1) == 2");
+  _assert(tm.getIndexFromOffset(a_width + b_width) == 2, "tm.getIndexFromOffset(a_width + b_width) == 2");
+  _assert(tm.getIndexFromOffset(a_width + b_width + c_width / 2) == 2, "tm.getIndexFromOffset(a_width + b_width + c_width / 2) == 2");
+  _assert(tm.getIndexFromOffset(a_width + b_width + c_width / 2 + 1) == 3, "tm.getIndexFromOffset(a_width + b_width + c_width / 2 + 1) == 3");
+  _assert(tm.getIndexFromOffset(a_width + b_width + c_width) == 3, "tm.getIndexFromOffset(a_width + b_width + c_width) == 3");
+
+}, "Test the edge cases for getIndexFromOffset, where the point is at the edge of glyph and at the midpoint.");
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.caret-position-edges.tentative.html b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.index-from-offset-edges.tentative.html
similarity index 88%
rename from tests/wpt/tests/html/canvas/element/text/2d.text.measure.caret-position-edges.tentative.html
rename to tests/wpt/tests/html/canvas/element/text/2d.text.measure.index-from-offset-edges.tentative.html
index cd56e20bb98..842f50857cc 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.caret-position-edges.tentative.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.index-from-offset-edges.tentative.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
 <meta charset="UTF-8">
-<title>Canvas test: 2d.text.measure.caret-position-edges.tentative</title>
+<title>Canvas test: 2d.text.measure.index-from-offset-edges.tentative</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 
-<h1>2d.text.measure.caret-position-edges.tentative</h1>
+<h1>2d.text.measure.index-from-offset-edges.tentative</h1>
 
 <script>
 
@@ -73,13 +73,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align left.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align left.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -143,13 +143,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align left.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align left.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -213,13 +213,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align center.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align center.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -283,13 +283,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align center.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align center.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -353,13 +353,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align right.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align right.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -423,13 +423,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align right.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align right.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -493,13 +493,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align start.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align start.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -563,13 +563,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align start.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align start.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -633,13 +633,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align end.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align end.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -703,13 +703,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align end.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align end.");
 
 </script>
 </div>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.caret-position.tentative.html b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.index-from-offset.tentative.html
similarity index 88%
rename from tests/wpt/tests/html/canvas/element/text/2d.text.measure.caret-position.tentative.html
rename to tests/wpt/tests/html/canvas/element/text/2d.text.measure.index-from-offset.tentative.html
index 4b223c8a0a3..9893fcdc4c2 100644
--- a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.caret-position.tentative.html
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.index-from-offset.tentative.html
@@ -1,13 +1,13 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
 <meta charset="UTF-8">
-<title>Canvas test: 2d.text.measure.caret-position.tentative</title>
+<title>Canvas test: 2d.text.measure.index-from-offset.tentative</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 <link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
 
-<h1>2d.text.measure.caret-position.tentative</h1>
+<h1>2d.text.measure.index-from-offset.tentative</h1>
 
 <script>
 
@@ -85,7 +85,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -93,7 +93,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -101,7 +101,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -109,13 +109,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -191,7 +191,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -199,7 +199,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -207,7 +207,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -215,13 +215,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -297,7 +297,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -305,7 +305,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -313,7 +313,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -321,13 +321,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -403,7 +403,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -411,7 +411,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -419,7 +419,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -427,13 +427,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -509,7 +509,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -517,7 +517,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -525,7 +525,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -533,13 +533,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -615,7 +615,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -623,7 +623,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -631,7 +631,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -639,13 +639,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -721,7 +721,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -729,7 +729,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -737,7 +737,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -745,13 +745,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -827,7 +827,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -835,7 +835,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -843,7 +843,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -851,13 +851,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -933,7 +933,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -941,7 +941,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -949,7 +949,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -957,13 +957,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -1039,7 +1039,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1047,7 +1047,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1055,7 +1055,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1063,13 +1063,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -1145,7 +1145,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1153,7 +1153,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1161,7 +1161,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1169,13 +1169,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -1251,7 +1251,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1259,7 +1259,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1267,7 +1267,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1275,13 +1275,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -1357,7 +1357,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1365,7 +1365,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1373,7 +1373,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1381,13 +1381,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -1463,7 +1463,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1471,7 +1471,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1479,7 +1479,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1487,13 +1487,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -1569,7 +1569,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1577,7 +1577,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1585,7 +1585,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1593,13 +1593,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -1675,7 +1675,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1683,7 +1683,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1691,7 +1691,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1699,13 +1699,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -1781,7 +1781,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1789,7 +1789,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1797,7 +1797,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1805,13 +1805,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -1887,7 +1887,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1895,7 +1895,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1903,7 +1903,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1911,13 +1911,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -1993,7 +1993,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2001,7 +2001,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2009,7 +2009,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2017,13 +2017,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -2099,7 +2099,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2107,7 +2107,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2115,7 +2115,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2123,13 +2123,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -2216,7 +2216,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2224,7 +2224,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2232,7 +2232,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2240,13 +2240,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -2333,7 +2333,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2341,7 +2341,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2349,7 +2349,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2357,13 +2357,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -2450,7 +2450,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2458,7 +2458,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2466,7 +2466,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2474,13 +2474,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -2567,7 +2567,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2575,7 +2575,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2583,7 +2583,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2591,13 +2591,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -2684,7 +2684,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2692,7 +2692,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2700,7 +2700,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2708,13 +2708,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -2801,7 +2801,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2809,7 +2809,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2817,7 +2817,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2825,13 +2825,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -2918,7 +2918,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2926,7 +2926,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2934,7 +2934,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2942,13 +2942,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -3035,7 +3035,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3043,7 +3043,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3051,7 +3051,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3059,13 +3059,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -3152,7 +3152,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3160,7 +3160,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3168,7 +3168,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3176,13 +3176,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -3269,7 +3269,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3277,7 +3277,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3285,7 +3285,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3293,13 +3293,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -3386,7 +3386,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3394,7 +3394,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3402,7 +3402,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3410,13 +3410,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -3503,7 +3503,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3511,7 +3511,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3519,7 +3519,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3527,13 +3527,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -3620,7 +3620,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3628,7 +3628,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3636,7 +3636,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3644,13 +3644,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -3737,7 +3737,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3745,7 +3745,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3753,7 +3753,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3761,13 +3761,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -3854,7 +3854,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3862,7 +3862,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3870,7 +3870,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3878,13 +3878,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -3971,7 +3971,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3979,7 +3979,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3987,7 +3987,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3995,13 +3995,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -4088,7 +4088,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4096,7 +4096,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4104,7 +4104,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4112,13 +4112,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -4205,7 +4205,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4213,7 +4213,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4221,7 +4221,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4229,13 +4229,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -4322,7 +4322,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4330,7 +4330,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4338,7 +4338,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4346,13 +4346,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = document.createElement('canvas');
@@ -4439,7 +4439,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4447,7 +4447,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4455,7 +4455,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4463,13 +4463,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and directional-override.");
 
 </script>
 </div>
diff --git a/tests/wpt/tests/html/canvas/element/text/2d.text.measure.text-clusters-rendering-options.tentative.html b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.text-clusters-rendering-options.tentative.html
new file mode 100644
index 00000000000..10a433cc61b
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/element/text/2d.text.measure.text-clusters-rendering-options.tentative.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>Canvas test: 2d.text.measure.text-clusters-rendering-options.tentative</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+<link rel="stylesheet" href="/html/canvas/resources/canvas-tests.css">
+<style>
+@font-face {
+  font-family: CanvasTest;
+  src: url("/fonts/CanvasTest.ttf");
+}
+</style>
+<body class="show_output">
+
+<h1>2d.text.measure.text-clusters-rendering-options.tentative</h1>
+<p class="desc">Test that fillTextCluster() correctly applies the options passed as a dictionary.</p>
+
+
+<span style="font-family: CanvasTest; position: absolute; visibility: hidden">A</span>
+<p class="output">Actual output:</p>
+<canvas id="c" class="output" width="100" height="300"><p class="fallback">FAIL (fallback content)</p></canvas>
+
+<ul id="d"></ul>
+<script>
+promise_test(async t => {
+
+  var canvas = document.getElementById('c');
+  var ctx = canvas.getContext('2d');
+
+  await document.fonts.ready;
+
+  ctx.font = '50px CanvasTest';
+  ctx.textAlign = 'left';
+  ctx.textBaseline = 'top';
+  const text = 'E';
+  const tm = ctx.measureText(text);
+  const cluster = tm.getTextClusters()[0];
+
+  // Background color.
+  ctx.fillStyle = '#f00';
+  ctx.fillRect(0, 0, canvas.width, canvas.height);
+
+  ctx.fillStyle = '#0f0';
+
+  // Override the align and baseline of the cluster.
+  ctx.fillTextCluster(cluster, 50, 50, {align: 'right', baseline: 'bottom'});
+  _assertPixelApprox(canvas, 5,5, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 45,5, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 5,45, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 45,45, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 55,5, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 5,55, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 5,55, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 55,55, 255,0,0,255, 2);
+
+  // Override the x and y values of the cluster.
+  ctx.fillTextCluster(cluster, 0, 100, {x: 10, y: 10});
+  _assertPixelApprox(canvas, 15,115, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 55,115, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 15,155, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 55,155, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 65,115, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 15,165, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 65,165, 255,0,0,255, 2);
+
+  // Override the align, baseline, x, and y values of the cluster.
+  ctx.fillTextCluster(cluster, 50, 250,
+                      {align: 'right', baseline: 'bottom', x: 10,  y: 10});
+  _assertPixelApprox(canvas, 15,215, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 55,215, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 15,255, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 55,255, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 65,215, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 15,265, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 65,265, 255,0,0,255, 2);
+
+}, "Test that fillTextCluster() correctly applies the options passed as a dictionary.");
+</script>
+
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.html
deleted file mode 100644
index a9bf8b4de59..00000000000
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
-<meta charset="UTF-8">
-<title>OffscreenCanvas test: 2d.text.measure.caret-position-edge-cases.tentative</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/html/canvas/resources/canvas-tests.js"></script>
-
-<h1>2d.text.measure.caret-position-edge-cases.tentative</h1>
-<p class="desc">Test the edge cases for caretPositionFromPoint, where the point is at the edge of glyph and at the midpoint.</p>
-
-
-<script>
-promise_test(async t => {
-
-  var canvas = new OffscreenCanvas(100, 50);
-  var ctx = canvas.getContext('2d');
-
-  var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')");
-  f.load();
-  document.fonts.add(f);
-  await document.fonts.ready;
-  ctx.font = '50px CanvasTest';
-  ctx.direction = 'ltr';
-  ctx.align = 'left'
-  ctx.baseline = 'alphabetic'
-  tm = ctx.measureText('A');
-  const a_width = tm.width;
-  tm = ctx.measureText('B');
-  const b_width = tm.width;
-  tm = ctx.measureText('C');
-  const c_width = tm.width;
-  const epsilon = 1.0e-4;
-
-  tm = ctx.measureText('ABC');
-  _assert(tm.caretPositionFromPoint(0) == 0, "tm.caretPositionFromPoint(0) == 0");
-  _assert(tm.caretPositionFromPoint(a_width / 2) == 0, "tm.caretPositionFromPoint(a_width / 2) == 0");
-  _assert(tm.caretPositionFromPoint(a_width / 2 + 1) == 1, "tm.caretPositionFromPoint(a_width / 2 + 1) == 1");
-  _assert(tm.caretPositionFromPoint(a_width) == 1, "tm.caretPositionFromPoint(a_width) == 1");
-  _assert(tm.caretPositionFromPoint(a_width + b_width / 2) == 1, "tm.caretPositionFromPoint(a_width + b_width / 2) == 1");
-  _assert(tm.caretPositionFromPoint(a_width + b_width / 2 + 1) == 2, "tm.caretPositionFromPoint(a_width + b_width / 2 + 1) == 2");
-  _assert(tm.caretPositionFromPoint(a_width + b_width) == 2, "tm.caretPositionFromPoint(a_width + b_width) == 2");
-  _assert(tm.caretPositionFromPoint(a_width + b_width + c_width / 2) == 2, "tm.caretPositionFromPoint(a_width + b_width + c_width / 2) == 2");
-  _assert(tm.caretPositionFromPoint(a_width + b_width + c_width / 2 + 1) == 3, "tm.caretPositionFromPoint(a_width + b_width + c_width / 2 + 1) == 3");
-  _assert(tm.caretPositionFromPoint(a_width + b_width + c_width) == 3, "tm.caretPositionFromPoint(a_width + b_width + c_width) == 3");
-
-}, "Test the edge cases for caretPositionFromPoint, where the point is at the edge of glyph and at the midpoint.");
-</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.js
deleted file mode 100644
index 83539222836..00000000000
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position-edge-cases.tentative.worker.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:2d.text.measure.caret-position-edge-cases.tentative
-// Description:Test the edge cases for caretPositionFromPoint, where the point is at the edge of glyph and at the midpoint.
-// Note:
-
-importScripts("/resources/testharness.js");
-importScripts("/html/canvas/resources/canvas-tests.js");
-
-promise_test(async t => {
-  var canvas = new OffscreenCanvas(100, 50);
-  var ctx = canvas.getContext('2d');
-
-  var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')");
-  f.load();
-  self.fonts.add(f);
-  await self.fonts.ready;
-  ctx.font = '50px CanvasTest';
-  ctx.direction = 'ltr';
-  ctx.align = 'left'
-  ctx.baseline = 'alphabetic'
-  tm = ctx.measureText('A');
-  const a_width = tm.width;
-  tm = ctx.measureText('B');
-  const b_width = tm.width;
-  tm = ctx.measureText('C');
-  const c_width = tm.width;
-  const epsilon = 1.0e-4;
-
-  tm = ctx.measureText('ABC');
-  _assert(tm.caretPositionFromPoint(0) == 0, "tm.caretPositionFromPoint(0) == 0");
-  _assert(tm.caretPositionFromPoint(a_width / 2) == 0, "tm.caretPositionFromPoint(a_width / 2) == 0");
-  _assert(tm.caretPositionFromPoint(a_width / 2 + 1) == 1, "tm.caretPositionFromPoint(a_width / 2 + 1) == 1");
-  _assert(tm.caretPositionFromPoint(a_width) == 1, "tm.caretPositionFromPoint(a_width) == 1");
-  _assert(tm.caretPositionFromPoint(a_width + b_width / 2) == 1, "tm.caretPositionFromPoint(a_width + b_width / 2) == 1");
-  _assert(tm.caretPositionFromPoint(a_width + b_width / 2 + 1) == 2, "tm.caretPositionFromPoint(a_width + b_width / 2 + 1) == 2");
-  _assert(tm.caretPositionFromPoint(a_width + b_width) == 2, "tm.caretPositionFromPoint(a_width + b_width) == 2");
-  _assert(tm.caretPositionFromPoint(a_width + b_width + c_width / 2) == 2, "tm.caretPositionFromPoint(a_width + b_width + c_width / 2) == 2");
-  _assert(tm.caretPositionFromPoint(a_width + b_width + c_width / 2 + 1) == 3, "tm.caretPositionFromPoint(a_width + b_width + c_width / 2 + 1) == 3");
-  _assert(tm.caretPositionFromPoint(a_width + b_width + c_width) == 3, "tm.caretPositionFromPoint(a_width + b_width + c_width) == 3");
-}, "Test the edge cases for caretPositionFromPoint, where the point is at the edge of glyph and at the midpoint.");
-done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.html
new file mode 100644
index 00000000000..5f0236bfa87
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>OffscreenCanvas test: 2d.text.measure.index-from-offset-edge-cases.tentative</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.text.measure.index-from-offset-edge-cases.tentative</h1>
+<p class="desc">Test the edge cases for getIndexFromOffset, where the point is at the edge of glyph and at the midpoint.</p>
+
+
+<script>
+promise_test(async t => {
+
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d');
+
+  var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')");
+  f.load();
+  document.fonts.add(f);
+  await document.fonts.ready;
+  ctx.font = '50px CanvasTest';
+  ctx.direction = 'ltr';
+  ctx.align = 'left'
+  ctx.baseline = 'alphabetic'
+  tm = ctx.measureText('A');
+  const a_width = tm.width;
+  tm = ctx.measureText('B');
+  const b_width = tm.width;
+  tm = ctx.measureText('C');
+  const c_width = tm.width;
+  const epsilon = 1.0e-4;
+
+  tm = ctx.measureText('ABC');
+  _assert(tm.getIndexFromOffset(0) == 0, "tm.getIndexFromOffset(0) == 0");
+  _assert(tm.getIndexFromOffset(a_width / 2) == 0, "tm.getIndexFromOffset(a_width / 2) == 0");
+  _assert(tm.getIndexFromOffset(a_width / 2 + 1) == 1, "tm.getIndexFromOffset(a_width / 2 + 1) == 1");
+  _assert(tm.getIndexFromOffset(a_width) == 1, "tm.getIndexFromOffset(a_width) == 1");
+  _assert(tm.getIndexFromOffset(a_width + b_width / 2) == 1, "tm.getIndexFromOffset(a_width + b_width / 2) == 1");
+  _assert(tm.getIndexFromOffset(a_width + b_width / 2 + 1) == 2, "tm.getIndexFromOffset(a_width + b_width / 2 + 1) == 2");
+  _assert(tm.getIndexFromOffset(a_width + b_width) == 2, "tm.getIndexFromOffset(a_width + b_width) == 2");
+  _assert(tm.getIndexFromOffset(a_width + b_width + c_width / 2) == 2, "tm.getIndexFromOffset(a_width + b_width + c_width / 2) == 2");
+  _assert(tm.getIndexFromOffset(a_width + b_width + c_width / 2 + 1) == 3, "tm.getIndexFromOffset(a_width + b_width + c_width / 2 + 1) == 3");
+  _assert(tm.getIndexFromOffset(a_width + b_width + c_width) == 3, "tm.getIndexFromOffset(a_width + b_width + c_width) == 3");
+
+}, "Test the edge cases for getIndexFromOffset, where the point is at the edge of glyph and at the midpoint.");
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.worker.js
new file mode 100644
index 00000000000..ae08c78d07a
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edge-cases.tentative.worker.js
@@ -0,0 +1,41 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.text.measure.index-from-offset-edge-cases.tentative
+// Description:Test the edge cases for getIndexFromOffset, where the point is at the edge of glyph and at the midpoint.
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+promise_test(async t => {
+  var canvas = new OffscreenCanvas(100, 50);
+  var ctx = canvas.getContext('2d');
+
+  var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')");
+  f.load();
+  self.fonts.add(f);
+  await self.fonts.ready;
+  ctx.font = '50px CanvasTest';
+  ctx.direction = 'ltr';
+  ctx.align = 'left'
+  ctx.baseline = 'alphabetic'
+  tm = ctx.measureText('A');
+  const a_width = tm.width;
+  tm = ctx.measureText('B');
+  const b_width = tm.width;
+  tm = ctx.measureText('C');
+  const c_width = tm.width;
+  const epsilon = 1.0e-4;
+
+  tm = ctx.measureText('ABC');
+  _assert(tm.getIndexFromOffset(0) == 0, "tm.getIndexFromOffset(0) == 0");
+  _assert(tm.getIndexFromOffset(a_width / 2) == 0, "tm.getIndexFromOffset(a_width / 2) == 0");
+  _assert(tm.getIndexFromOffset(a_width / 2 + 1) == 1, "tm.getIndexFromOffset(a_width / 2 + 1) == 1");
+  _assert(tm.getIndexFromOffset(a_width) == 1, "tm.getIndexFromOffset(a_width) == 1");
+  _assert(tm.getIndexFromOffset(a_width + b_width / 2) == 1, "tm.getIndexFromOffset(a_width + b_width / 2) == 1");
+  _assert(tm.getIndexFromOffset(a_width + b_width / 2 + 1) == 2, "tm.getIndexFromOffset(a_width + b_width / 2 + 1) == 2");
+  _assert(tm.getIndexFromOffset(a_width + b_width) == 2, "tm.getIndexFromOffset(a_width + b_width) == 2");
+  _assert(tm.getIndexFromOffset(a_width + b_width + c_width / 2) == 2, "tm.getIndexFromOffset(a_width + b_width + c_width / 2) == 2");
+  _assert(tm.getIndexFromOffset(a_width + b_width + c_width / 2 + 1) == 3, "tm.getIndexFromOffset(a_width + b_width + c_width / 2 + 1) == 3");
+  _assert(tm.getIndexFromOffset(a_width + b_width + c_width) == 3, "tm.getIndexFromOffset(a_width + b_width + c_width) == 3");
+}, "Test the edge cases for getIndexFromOffset, where the point is at the edge of glyph and at the midpoint.");
+done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edges.tentative.html
similarity index 88%
rename from tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.html
rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edges.tentative.html
index a6e45274c73..fbefdd5804c 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edges.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
 <meta charset="UTF-8">
-<title>OffscreenCanvas test: 2d.text.measure.caret-position-edges.tentative</title>
+<title>OffscreenCanvas test: 2d.text.measure.index-from-offset-edges.tentative</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>2d.text.measure.caret-position-edges.tentative</h1>
+<h1>2d.text.measure.index-from-offset-edges.tentative</h1>
 
 <script>
 
@@ -72,13 +72,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align left.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align left.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -142,13 +142,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align left.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align left.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -212,13 +212,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align center.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align center.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -282,13 +282,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align center.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align center.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -352,13 +352,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align right.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align right.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -422,13 +422,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align right.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align right.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -492,13 +492,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align start.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align start.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -562,13 +562,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align start.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align start.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -632,13 +632,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align end.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align end.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -702,12 +702,12 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align end.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align end.");
 
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edges.tentative.worker.js
similarity index 88%
rename from tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.worker.js
rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edges.tentative.worker.js
index 2cef8432d2a..2ec89e84b51 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position-edges.tentative.worker.js
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset-edges.tentative.worker.js
@@ -1,5 +1,5 @@
 // DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
-// OffscreenCanvas test in a worker:2d.text.measure.caret-position-edges.tentative
+// OffscreenCanvas test in a worker:2d.text.measure.index-from-offset-edges.tentative
 // Description:
 // Note:
 
@@ -68,13 +68,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align left.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align left.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -138,13 +138,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align left.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align left.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -208,13 +208,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align center.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align center.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -278,13 +278,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align center.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align center.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -348,13 +348,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align right.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align right.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -418,13 +418,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align right.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align right.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -488,13 +488,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align start.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align start.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -558,13 +558,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align start.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align start.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -628,13 +628,13 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction ltr and text align end.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction ltr and text align end.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -698,12 +698,12 @@ test(t => {
   text_width = tm.width;
   for (const multiple of kPoints) {
     offset = multiple * text_width;
-    tm_position = tm.caretPositionFromPoint(offset);
+    tm_position = tm.getIndexFromOffset(offset);
     expected_position = computeExpected(text, text_width, offset);
     assert_equals(tm_position,
                   expected_position,
                   "for " + text + " multiple " + multiple);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() gives correct edges when the requested point is outside the range, with direction rtl and text align end.");
+}, "Check that TextMetrics::getIndexFromOffset() gives correct edges when the requested point is outside the range, with direction rtl and text align end.");
 
 done();
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position.tentative.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset.tentative.html
similarity index 88%
rename from tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position.tentative.html
rename to tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset.tentative.html
index 3c1873aaf1f..18e42aff3c3 100644
--- a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.caret-position.tentative.html
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.index-from-offset.tentative.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
 <meta charset="UTF-8">
-<title>OffscreenCanvas test: 2d.text.measure.caret-position.tentative</title>
+<title>OffscreenCanvas test: 2d.text.measure.index-from-offset.tentative</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/html/canvas/resources/canvas-tests.js"></script>
 
-<h1>2d.text.measure.caret-position.tentative</h1>
+<h1>2d.text.measure.index-from-offset.tentative</h1>
 
 <script>
 
@@ -84,7 +84,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -92,7 +92,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -100,7 +100,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -108,13 +108,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -190,7 +190,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -198,7 +198,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -206,7 +206,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -214,13 +214,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -296,7 +296,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -304,7 +304,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -312,7 +312,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -320,13 +320,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -402,7 +402,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -410,7 +410,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -418,7 +418,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -426,13 +426,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -508,7 +508,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -516,7 +516,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -524,7 +524,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -532,13 +532,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -614,7 +614,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -622,7 +622,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -630,7 +630,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -638,13 +638,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -720,7 +720,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -728,7 +728,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -736,7 +736,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -744,13 +744,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -826,7 +826,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -834,7 +834,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -842,7 +842,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -850,13 +850,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -932,7 +932,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -940,7 +940,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -948,7 +948,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -956,13 +956,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -1038,7 +1038,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1046,7 +1046,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1054,7 +1054,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1062,13 +1062,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -1144,7 +1144,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1152,7 +1152,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1160,7 +1160,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1168,13 +1168,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -1250,7 +1250,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1258,7 +1258,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1266,7 +1266,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1274,13 +1274,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -1356,7 +1356,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1364,7 +1364,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1372,7 +1372,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1380,13 +1380,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -1462,7 +1462,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1470,7 +1470,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1478,7 +1478,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1486,13 +1486,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -1568,7 +1568,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1576,7 +1576,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1584,7 +1584,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1592,13 +1592,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -1674,7 +1674,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1682,7 +1682,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1690,7 +1690,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1698,13 +1698,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -1780,7 +1780,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1788,7 +1788,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1796,7 +1796,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1804,13 +1804,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -1886,7 +1886,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1894,7 +1894,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1902,7 +1902,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -1910,13 +1910,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -1992,7 +1992,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2000,7 +2000,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2008,7 +2008,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2016,13 +2016,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -2098,7 +2098,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2106,7 +2106,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2114,7 +2114,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2122,13 +2122,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and no-directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and no-directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -2215,7 +2215,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2223,7 +2223,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2231,7 +2231,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2239,13 +2239,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align left, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -2332,7 +2332,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2340,7 +2340,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2348,7 +2348,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2356,13 +2356,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align left, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -2449,7 +2449,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2457,7 +2457,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2465,7 +2465,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2473,13 +2473,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align center, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -2566,7 +2566,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2574,7 +2574,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2582,7 +2582,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2590,13 +2590,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align center, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -2683,7 +2683,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2691,7 +2691,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2699,7 +2699,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2707,13 +2707,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align right, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -2800,7 +2800,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2808,7 +2808,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2816,7 +2816,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2824,13 +2824,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align right, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -2917,7 +2917,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2925,7 +2925,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2933,7 +2933,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -2941,13 +2941,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align start, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -3034,7 +3034,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3042,7 +3042,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3050,7 +3050,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3058,13 +3058,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align start, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -3151,7 +3151,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3159,7 +3159,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3167,7 +3167,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3175,13 +3175,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align end, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -3268,7 +3268,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3276,7 +3276,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3284,7 +3284,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3292,13 +3292,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align end, 0px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -3385,7 +3385,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3393,7 +3393,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3401,7 +3401,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3409,13 +3409,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align left, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -3502,7 +3502,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3510,7 +3510,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3518,7 +3518,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3526,13 +3526,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align left, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -3619,7 +3619,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3627,7 +3627,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3635,7 +3635,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3643,13 +3643,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align center, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -3736,7 +3736,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3744,7 +3744,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3752,7 +3752,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3760,13 +3760,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align center, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -3853,7 +3853,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3861,7 +3861,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3869,7 +3869,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3877,13 +3877,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align right, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -3970,7 +3970,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3978,7 +3978,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3986,7 +3986,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -3994,13 +3994,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align right, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -4087,7 +4087,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4095,7 +4095,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4103,7 +4103,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4111,13 +4111,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align start, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -4204,7 +4204,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4212,7 +4212,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4220,7 +4220,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4228,13 +4228,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align start, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -4321,7 +4321,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4329,7 +4329,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4337,7 +4337,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4345,13 +4345,13 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction ltr, text align end, 10px letter spacing and directional-override.");
 
 test(t => {
   const canvas = new OffscreenCanvas(100, 50);
@@ -4438,7 +4438,7 @@ test(t => {
 
     offset = step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4446,7 +4446,7 @@ test(t => {
 
     offset = text_width / 2 - 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4454,7 +4454,7 @@ test(t => {
 
     offset = text_width / 2 + 10;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
@@ -4462,12 +4462,12 @@ test(t => {
 
     offset = text_width - step;
     adjusted_offset = alignOffset(offset, text_width);
-    tm_position = tm.caretPositionFromPoint(adjusted_offset);
+    tm_position = tm.getIndexFromOffset(adjusted_offset);
     doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
     assert_equals(tm_position,
                   doc_position,
                   "for " + text + " offset " + offset);
   }
-}, "Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and directional-override.");
+}, "Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent, where possible, with direction rtl, text align end, 10px letter spacing and directional-override.");
 
 </script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.html b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.html
new file mode 100644
index 00000000000..645013528e8
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py. -->
+<meta charset="UTF-8">
+<title>OffscreenCanvas test: 2d.text.measure.text-clusters-rendering-options.tentative</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/html/canvas/resources/canvas-tests.js"></script>
+
+<h1>2d.text.measure.text-clusters-rendering-options.tentative</h1>
+<p class="desc">Test that fillTextCluster() correctly applies the options passed as a dictionary.</p>
+
+
+<script>
+promise_test(async t => {
+
+  var canvas = new OffscreenCanvas(100, 300);
+  var ctx = canvas.getContext('2d');
+
+  var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')");
+  f.load();
+  document.fonts.add(f);
+  await document.fonts.ready;
+
+  ctx.font = '50px CanvasTest';
+  ctx.textAlign = 'left';
+  ctx.textBaseline = 'top';
+  const text = 'E';
+  const tm = ctx.measureText(text);
+  const cluster = tm.getTextClusters()[0];
+
+  // Background color.
+  ctx.fillStyle = '#f00';
+  ctx.fillRect(0, 0, canvas.width, canvas.height);
+
+  ctx.fillStyle = '#0f0';
+
+  // Override the align and baseline of the cluster.
+  ctx.fillTextCluster(cluster, 50, 50, {align: 'right', baseline: 'bottom'});
+  _assertPixelApprox(canvas, 5,5, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 45,5, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 5,45, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 45,45, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 55,5, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 5,55, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 5,55, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 55,55, 255,0,0,255, 2);
+
+  // Override the x and y values of the cluster.
+  ctx.fillTextCluster(cluster, 0, 100, {x: 10, y: 10});
+  _assertPixelApprox(canvas, 15,115, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 55,115, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 15,155, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 55,155, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 65,115, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 15,165, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 65,165, 255,0,0,255, 2);
+
+  // Override the align, baseline, x, and y values of the cluster.
+  ctx.fillTextCluster(cluster, 50, 250,
+                      {align: 'right', baseline: 'bottom', x: 10,  y: 10});
+  _assertPixelApprox(canvas, 15,215, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 55,215, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 15,255, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 55,255, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 65,215, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 15,265, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 65,265, 255,0,0,255, 2);
+
+}, "Test that fillTextCluster() correctly applies the options passed as a dictionary.");
+</script>
diff --git a/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.worker.js b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.worker.js
new file mode 100644
index 00000000000..f55d2c46556
--- /dev/null
+++ b/tests/wpt/tests/html/canvas/offscreen/text/2d.text.measure.text-clusters-rendering-options.tentative.worker.js
@@ -0,0 +1,63 @@
+// DO NOT EDIT! This test has been generated by /html/canvas/tools/gentest.py.
+// OffscreenCanvas test in a worker:2d.text.measure.text-clusters-rendering-options.tentative
+// Description:Test that fillTextCluster() correctly applies the options passed as a dictionary.
+// Note:
+
+importScripts("/resources/testharness.js");
+importScripts("/html/canvas/resources/canvas-tests.js");
+
+promise_test(async t => {
+  var canvas = new OffscreenCanvas(100, 300);
+  var ctx = canvas.getContext('2d');
+
+  var f = new FontFace("CanvasTest", "url('/fonts/CanvasTest.ttf')");
+  f.load();
+  self.fonts.add(f);
+  await self.fonts.ready;
+
+  ctx.font = '50px CanvasTest';
+  ctx.textAlign = 'left';
+  ctx.textBaseline = 'top';
+  const text = 'E';
+  const tm = ctx.measureText(text);
+  const cluster = tm.getTextClusters()[0];
+
+  // Background color.
+  ctx.fillStyle = '#f00';
+  ctx.fillRect(0, 0, canvas.width, canvas.height);
+
+  ctx.fillStyle = '#0f0';
+
+  // Override the align and baseline of the cluster.
+  ctx.fillTextCluster(cluster, 50, 50, {align: 'right', baseline: 'bottom'});
+  _assertPixelApprox(canvas, 5,5, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 45,5, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 5,45, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 45,45, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 55,5, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 5,55, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 5,55, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 55,55, 255,0,0,255, 2);
+
+  // Override the x and y values of the cluster.
+  ctx.fillTextCluster(cluster, 0, 100, {x: 10, y: 10});
+  _assertPixelApprox(canvas, 15,115, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 55,115, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 15,155, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 55,155, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 65,115, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 15,165, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 65,165, 255,0,0,255, 2);
+
+  // Override the align, baseline, x, and y values of the cluster.
+  ctx.fillTextCluster(cluster, 50, 250,
+                      {align: 'right', baseline: 'bottom', x: 10,  y: 10});
+  _assertPixelApprox(canvas, 15,215, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 55,215, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 15,255, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 55,255, 0,255,0,255, 2);
+  _assertPixelApprox(canvas, 65,215, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 15,265, 255,0,0,255, 2);
+  _assertPixelApprox(canvas, 65,265, 255,0,0,255, 2);
+}, "Test that fillTextCluster() correctly applies the options passed as a dictionary.");
+done();
diff --git a/tests/wpt/tests/html/canvas/tools/yaml-new/text.yaml b/tests/wpt/tests/html/canvas/tools/yaml-new/text.yaml
index 38630509bf2..42bf9a3c939 100644
--- a/tests/wpt/tests/html/canvas/tools/yaml-new/text.yaml
+++ b/tests/wpt/tests/html/canvas/tools/yaml-new/text.yaml
@@ -1719,9 +1719,9 @@
                         () => tm.getActualBoundingBox(text.length, text.length + 1) );
     }
 
-- name: 2d.text.measure.caret-position.tentative
+- name: 2d.text.measure.index-from-offset.tentative
   desc: >-
-    Check that TextMetrics::caretPositionFromPoint() matches its DOM equivalent,
+    Check that TextMetrics::getIndexFromOffset() matches its DOM equivalent,
     where possible, with direction {{ text_direction }}, text align
     {{ text_align }}, {{ letter_spacing }} letter spacing and
     {{ variant_names[3] }}.
@@ -1812,7 +1812,7 @@
 
       offset = step;
       adjusted_offset = alignOffset(offset, text_width);
-      tm_position = tm.caretPositionFromPoint(adjusted_offset);
+      tm_position = tm.getIndexFromOffset(adjusted_offset);
       doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
       assert_equals(tm_position,
                     doc_position,
@@ -1820,7 +1820,7 @@
 
       offset = text_width / 2 - 10;
       adjusted_offset = alignOffset(offset, text_width);
-      tm_position = tm.caretPositionFromPoint(adjusted_offset);
+      tm_position = tm.getIndexFromOffset(adjusted_offset);
       doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
       assert_equals(tm_position,
                     doc_position,
@@ -1828,7 +1828,7 @@
 
       offset = text_width / 2 + 10;
       adjusted_offset = alignOffset(offset, text_width);
-      tm_position = tm.caretPositionFromPoint(adjusted_offset);
+      tm_position = tm.getIndexFromOffset(adjusted_offset);
       doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
       assert_equals(tm_position,
                     doc_position,
@@ -1836,7 +1836,7 @@
 
       offset = text_width - step;
       adjusted_offset = alignOffset(offset, text_width);
-      tm_position = tm.caretPositionFromPoint(adjusted_offset);
+      tm_position = tm.getIndexFromOffset(adjusted_offset);
       doc_position = placeAndMeasureTextInDOM(text, text_width, adjusted_offset);
       assert_equals(tm_position,
                     doc_position,
@@ -1867,9 +1867,9 @@
     directional-override:
       use_directional_override: true
 
-- name: 2d.text.measure.caret-position-edges.tentative
+- name: 2d.text.measure.index-from-offset-edges.tentative
   desc: >-
-    Check that TextMetrics::caretPositionFromPoint() gives correct edges when
+    Check that TextMetrics::getIndexFromOffset() gives correct edges when
     the requested point is outside the range, with direction {{ text_direction }}
     and text align {{ text_align }}.
   code: |
@@ -1931,7 +1931,7 @@
     text_width = tm.width;
     for (const multiple of kPoints) {
       offset = multiple * text_width;
-      tm_position = tm.caretPositionFromPoint(offset);
+      tm_position = tm.getIndexFromOffset(offset);
       expected_position = computeExpected(text, text_width, offset);
       assert_equals(tm_position,
                     expected_position,
@@ -1954,9 +1954,9 @@
     align-end:
       text_align: end
 
-- name: 2d.text.measure.caret-position-edge-cases.tentative
+- name: 2d.text.measure.index-from-offset-edge-cases.tentative
   desc: >-
-    Test the edge cases for caretPositionFromPoint, where the point is at the
+    Test the edge cases for getIndexFromOffset, where the point is at the
     edge of glyph and at the midpoint.
   test_type: promise
   fonts:
@@ -1976,16 +1976,16 @@
     const epsilon = 1.0e-4;
 
     tm = ctx.measureText('ABC');
-    @assert tm.caretPositionFromPoint(0) == 0;
-    @assert tm.caretPositionFromPoint(a_width / 2) == 0;
-    @assert tm.caretPositionFromPoint(a_width / 2 + 1) == 1;
-    @assert tm.caretPositionFromPoint(a_width) == 1;
-    @assert tm.caretPositionFromPoint(a_width + b_width / 2) == 1;
-    @assert tm.caretPositionFromPoint(a_width + b_width / 2 + 1) == 2;
-    @assert tm.caretPositionFromPoint(a_width + b_width) == 2;
-    @assert tm.caretPositionFromPoint(a_width + b_width + c_width / 2) == 2;
-    @assert tm.caretPositionFromPoint(a_width + b_width + c_width / 2 + 1) == 3;
-    @assert tm.caretPositionFromPoint(a_width + b_width + c_width) == 3;
+    @assert tm.getIndexFromOffset(0) == 0;
+    @assert tm.getIndexFromOffset(a_width / 2) == 0;
+    @assert tm.getIndexFromOffset(a_width / 2 + 1) == 1;
+    @assert tm.getIndexFromOffset(a_width) == 1;
+    @assert tm.getIndexFromOffset(a_width + b_width / 2) == 1;
+    @assert tm.getIndexFromOffset(a_width + b_width / 2 + 1) == 2;
+    @assert tm.getIndexFromOffset(a_width + b_width) == 2;
+    @assert tm.getIndexFromOffset(a_width + b_width + c_width / 2) == 2;
+    @assert tm.getIndexFromOffset(a_width + b_width + c_width / 2 + 1) == 3;
+    @assert tm.getIndexFromOffset(a_width + b_width + c_width) == 3;
   variants:
   - *load-font-variant-definition
 
@@ -2300,6 +2300,64 @@
   variants:
   - *load-font-variant-definition
 
+- name: 2d.text.measure.text-clusters-rendering-options.tentative
+  desc: >-
+    Test that fillTextCluster() correctly applies the options passed as a
+    dictionary.
+  test_type: promise
+  fonts:
+  - CanvasTest
+  size: [100, 300]
+  code: |
+    {{ load_font }}
+
+    ctx.font = '50px CanvasTest';
+    ctx.textAlign = 'left';
+    ctx.textBaseline = 'top';
+    const text = 'E';
+    const tm = ctx.measureText(text);
+    const cluster = tm.getTextClusters()[0];
+
+    // Background color.
+    ctx.fillStyle = '#f00';
+    ctx.fillRect(0, 0, canvas.width, canvas.height);
+
+    ctx.fillStyle = '#0f0';
+
+    // Override the align and baseline of the cluster.
+    ctx.fillTextCluster(cluster, 50, 50, {align: 'right', baseline: 'bottom'});
+    @assert pixel 5,5 ==~ 0,255,0,255;
+    @assert pixel 45,5 ==~ 0,255,0,255;
+    @assert pixel 5,45 ==~ 0,255,0,255;
+    @assert pixel 45,45 ==~ 0,255,0,255;
+    @assert pixel 55,5 ==~ 255,0,0,255;
+    @assert pixel 5,55 ==~ 255,0,0,255;
+    @assert pixel 5,55 ==~ 255,0,0,255;
+    @assert pixel 55,55 ==~ 255,0,0,255;
+
+    // Override the x and y values of the cluster.
+    ctx.fillTextCluster(cluster, 0, 100, {x: 10, y: 10});
+    @assert pixel 15,115 ==~ 0,255,0,255;
+    @assert pixel 55,115 ==~ 0,255,0,255;
+    @assert pixel 15,155 ==~ 0,255,0,255;
+    @assert pixel 55,155 ==~ 0,255,0,255;
+    @assert pixel 65,115 ==~ 255,0,0,255;
+    @assert pixel 15,165 ==~ 255,0,0,255;
+    @assert pixel 65,165 ==~ 255,0,0,255;
+
+    // Override the align, baseline, x, and y values of the cluster.
+    ctx.fillTextCluster(cluster, 50, 250,
+                        {align: 'right', baseline: 'bottom', x: 10,  y: 10});
+    @assert pixel 15,215 ==~ 0,255,0,255;
+    @assert pixel 55,215 ==~ 0,255,0,255;
+    @assert pixel 15,255 ==~ 0,255,0,255;
+    @assert pixel 55,255 ==~ 0,255,0,255;
+    @assert pixel 65,215 ==~ 255,0,0,255;
+    @assert pixel 15,265 ==~ 255,0,0,255;
+    @assert pixel 65,265 ==~ 255,0,0,255;
+  variants:
+  - *load-font-variant-definition
+
 - name: 2d.text.drawing.style.absolute.spacing
   desc: Testing letter spacing and word spacing with absolute length
   code: |
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-001.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-001.html
index 36567f9d54a..b166cbd23c8 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-001.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-001.html
@@ -16,13 +16,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-002.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-002.html
index 3c907597f7a..bfb75a5afd2 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-002.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-002.html
@@ -17,21 +17,46 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="third"></div>
+  <div id="third">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="fourth"></div>
+  <div id="fourth">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-003.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-003.html
index 2858798a35f..12fbb56b8b5 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-003.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-003.html
@@ -21,13 +21,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-004.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-004.html
index f45f5587204..3c908bfa2f3 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-004.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-004.html
@@ -18,13 +18,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-005.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-005.html
index 098a3c57676..4fdfd8877db 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-005.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-005.html
@@ -18,13 +18,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-006.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-006.html
index 223e42109e5..925a013d90d 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-006.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-006.html
@@ -18,13 +18,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-007.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-007.html
index 9aa0aeea798..4762d1259a9 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-007.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-007.html
@@ -16,13 +16,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-008.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-008.html
index e671dda19c4..4756cd4844d 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-008.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-008.html
@@ -18,13 +18,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-009.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-009.html
index 8498816ea5c..d2a0470ee03 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-009.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-009.html
@@ -18,13 +18,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-010.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-010.html
index ef6f709012e..2eb60dbef81 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-010.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-010.html
@@ -18,13 +18,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-011.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-011.html
index dee82d8c595..2ea63657247 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-011.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-011.html
@@ -18,13 +18,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-012.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-012.html
index 4110e54c5f2..65209cb667c 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-012.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-012.html
@@ -18,13 +18,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-013.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-013.html
index ecd97be86a6..27d724dc614 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-013.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-013.html
@@ -18,13 +18,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-014.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-014.html
index ea8948de42d..735f9ad86c7 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-014.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-014.html
@@ -24,13 +24,28 @@ link.blocking = "render";
 document.head.appendChild(link);
 </script>
 
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-015.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-015.html
index a775ee41740..da6e7660897 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-015.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-015.html
@@ -20,13 +20,28 @@ async_test((t) => {
 link.remove();
 </script>
 
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-016.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-016.html
index 8968c5dacd3..9d836dfafdd 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-016.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-016.html
@@ -20,13 +20,28 @@ async_test((t) => {
 link.blocking = "";
 </script>
 
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-017.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-017.html
index 2d3b5747216..fff6c48b581 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-017.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-017.html
@@ -19,13 +19,28 @@ async_test((t) => {
 <script>
 link.blocking = "render"
 </script>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-018.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-018.html
index 76e6394b5b1..896e6efbbf6 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-018.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-018.html
@@ -20,13 +20,28 @@ async_test((t) => {
 link.media = "(min-width: 10px)";
 </script>
 
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-019.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-019.html
index 80a7019edc4..709f8d05b06 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-019.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-019.html
@@ -20,13 +20,28 @@ async_test((t) => {
 link.media = "(max-width: 10px)";
 </script>
 
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-020.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-020.html
index 10019c943f4..054430b960c 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-020.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-020.html
@@ -19,13 +19,28 @@ async_test((t) => {
 <script>
 link.rel = "stylesheet";
 </script>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-021.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-021.html
index 1ca2114689a..11126b869ad 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-021.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-021.html
@@ -19,17 +19,37 @@ async_test((t) => {
 <script>
 link.rel = "expect";
 </script>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="third"></div>
+  <div id="third">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-022.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-022.html
index 5dfbcac30a4..cecf88505fd 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-022.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-022.html
@@ -20,13 +20,28 @@ async_test((t) => {
 link.href = "#last";
 </script>
 
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-023.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-023.html
index 8fe8b6a8c8e..3b52dce4703 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-023.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-023.html
@@ -19,13 +19,28 @@ async_test((t) => {
 <script>
 link.href = "";
 </script>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-024.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-024.html
index 19e4020fb76..fae9e81a28d 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-024.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-024.html
@@ -16,21 +16,46 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="third"></div>
+  <div id="third">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="fourth"></div>
+  <div id="fourth">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
           generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-025.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-025.html
index 689ae69f452..aebe11d9496 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-025.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-025.html
@@ -17,22 +17,47 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="willbefirst"></div>
+  <div id="willbefirst">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
     willbefirst.id = "first";
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="third"></div>
+  <div id="third">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="fourth"></div>
+  <div id="fourth">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-026.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-026.html
index 6abfc43b8b2..5755ef302d1 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-026.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-026.html
@@ -17,22 +17,47 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
     first.id = "wasfirst";
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="third"></div>
+  <div id="third">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="fourth"></div>
+  <div id="fourth">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-027.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-027.html
index 56f88e0fc2b..f7b2d65e7ea 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-027.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-027.html
@@ -18,21 +18,46 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="notfirst"></div>
+  <div id="notfirst">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="third"></div>
+  <div id="third">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="fourth"></div>
+  <div id="fourth">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-028.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-028.html
index a64d542c4ac..9ec14bf9d9a 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-028.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-028.html
@@ -28,21 +28,46 @@ two.remove();
 three.remove();
 four.remove();
 </script>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="second"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="third"></div>
+  <div id="third">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="fourth"></div>
+  <div id="fourth">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-029.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-029.html
index 44dff3cb842..5e6ee8c88c0 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-029.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-029.html
@@ -17,13 +17,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <a name="second"></a>
+  <a name="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </a>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-030.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-030.html
index 307c2d303d0..95c3cd20677 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-030.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-030.html
@@ -17,18 +17,37 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
   <a name="fold">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
     <script>
       generateParserDelay();
     </script>
-    <div id="second"></div>
+    <div id="second">
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+      nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+      tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+      tempor mi est eget ipsum egestas.
+    </div>
   </a>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-031.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-031.html
index 2098483a060..0c061ad17a5 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-031.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-031.html
@@ -17,16 +17,31 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <a id="fold"></a>
+  <a id="fold">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </a>
   <script>
-          document.getElementById("fold").setAttribute("name", "second");
+    document.getElementById("fold").setAttribute("name", "second");
   </script>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-032.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-032.html
index 307c2d303d0..95c3cd20677 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-032.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-032.html
@@ -17,18 +17,37 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
   <a name="fold">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
     <script>
       generateParserDelay();
     </script>
-    <div id="second"></div>
+    <div id="second">
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+      nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+      tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+      tempor mi est eget ipsum egestas.
+    </div>
   </a>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-033.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-033.html
index 59d41c08c0a..c189dfd2b90 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-033.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-033.html
@@ -18,13 +18,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="se😏cond"></div>
+  <div id="se😏cond">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-034.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-034.html
index a505de48756..0824550fd30 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-034.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-034.html
@@ -17,14 +17,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
-  <script>
-          generateParserDelay();
-  </script>
-  <div id="second">
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
   </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
+  <script>
+    generateParserDelay();
+  </script>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-035.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-035.html
index 050244c7a69..3d05f729d44 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-035.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-035.html
@@ -18,14 +18,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
-  <script>
-          generateParserDelay();
-  </script>
-  <div id="second">
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
   </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
+  <script>
+    generateParserDelay();
+  </script>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-036.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-036.html
index 83637b3a08b..c0a18b62dc6 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-036.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-036.html
@@ -18,14 +18,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
-  <script>
-          generateParserDelay();
-  </script>
-  <div id="second">
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
   </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
+  <script>
+    generateParserDelay();
+  </script>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-037.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-037.html
index 5fe469a2fdd..f72daac4731 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-037.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-037.html
@@ -18,14 +18,28 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
-  <script>
-          generateParserDelay();
-  </script>
-  <div id="second">
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
   </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="second">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
+  <script>
+    generateParserDelay();
+  </script>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-038.html b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-038.html
index c7fabe7f320..8dad0a414ff 100644
--- a/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-038.html
+++ b/tests/wpt/tests/html/dom/render-blocking/element-render-blocking-038.html
@@ -17,19 +17,34 @@ async_test((t) => {
 </script>
 </head>
 <body>
-  <div id="first"></div>
+  <div id="first">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
   <div id="second">
     <custom-element>
       <template shadowrootmode="open">
-        <div id="last"></div>
+        <div id="last">
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+          nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+          tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+          tempor mi est eget ipsum egestas.
+        </div>
       </template>
     </custom-element>
   </div>
   <script>
-          generateParserDelay();
+    generateParserDelay();
   </script>
-  <div id="last"></div>
+  <div id="last">
+    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum augue
+    nibh, venenatis a ligula in, tempus pharetra urna. Fusce semper, velit
+    tincidunt lobortis sollicitudin, sapien velit fermentum odio, ultricies
+    tempor mi est eget ipsum egestas.
+  </div>
 </body>
diff --git a/tests/wpt/tests/html/semantics/forms/the-button-element/button-click-resets-with-commandfor.tentative.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-click-resets-with-commandfor.tentative.html
new file mode 100644
index 00000000000..a1e3669717e
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-button-element/button-click-resets-with-commandfor.tentative.html
@@ -0,0 +1,64 @@
+<!doctype html>
+<meta charset="utf-8" />
+<title>Clicking a button should submit the form</title>
+<meta name="author" title="Keith Cirkel" href="mailto:wpt@keithcirkel.co.uk" />
+<link
+  rel="help"
+  href="https://html.spec.whatwg.org/multipage/#attr-button-type-submit-state"
+/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<form id="form">
+  <button id="button" type="reset"></button>
+</form>
+
+<script>
+  const form = document.getElementById("form");
+  const button = document.getElementById("button");
+
+  function resetState() {
+    button.removeAttribute("commandfor");
+    button.removeAttribute("command");
+    button.removeAttribute("disabled");
+    button.removeAttribute("form");
+    button.setAttribute("type", "reset");
+  }
+
+  test((t) => {
+    t.add_cleanup(resetState);
+    button.setAttribute("command", "--foo");
+
+    let called = false;
+    form.addEventListener("reset", (e) => {
+      called = true;
+    });
+    button.click();
+    assert_true(called, "reset should have been dispatched");
+  }, "clicking a reset button should trigger a reset (with command attribute)");
+
+  test((t) => {
+    t.add_cleanup(resetState);
+    button.setAttribute("commandfor", "whatever");
+
+    let called = false;
+    form.addEventListener("reset", (e) => {
+      called = true;
+    });
+    button.click();
+    assert_true(called, "reset should have been dispatched");
+  }, "clicking a button should trigger a reset (with commandfor attribute)");
+
+  test((t) => {
+    t.add_cleanup(resetState);
+    button.setAttribute("command", "--foo");
+    button.setAttribute("commandfor", "whatever");
+
+    let called = false;
+    form.addEventListener("reset", (e) => {
+      called = true;
+    });
+    button.click();
+    assert_true(called, "reset should have been dispatched");
+  }, "clicking a button should trigger a reset (with command and commandfor attribute)");
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-button-element/button-click-submits-with-commandfor.tentative.html b/tests/wpt/tests/html/semantics/forms/the-button-element/button-click-submits-with-commandfor.tentative.html
new file mode 100644
index 00000000000..ced0d9ef152
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-button-element/button-click-submits-with-commandfor.tentative.html
@@ -0,0 +1,110 @@
+<!doctype html>
+<meta charset="utf-8" />
+<title>Clicking a button should submit the form</title>
+<meta name="author" title="Keith Cirkel" href="mailto:wpt@keithcirkel.co.uk" />
+<link
+  rel="help"
+  href="https://html.spec.whatwg.org/multipage/#attr-button-type-submit-state"
+/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<form id="form">
+  <button id="button"></button>
+</form>
+
+<script>
+  const form = document.getElementById("form");
+  const button = document.getElementById("button");
+
+  function resetState() {
+    button.removeAttribute("commandfor");
+    button.removeAttribute("command");
+    button.removeAttribute("disabled");
+    button.removeAttribute("form");
+    button.removeAttribute("type");
+  }
+
+  test((t) => {
+    t.add_cleanup(resetState);
+    button.setAttribute("command", "--foo");
+
+    let called = false;
+    form.addEventListener("submit", (e) => {
+      e.preventDefault();
+      called = true;
+    }, { once: true });
+    button.click();
+    assert_false(called, "submit should not have been dispatched");
+  }, "clicking a button (implicit type) should NOT trigger a submit (with command attribute)");
+
+  test((t) => {
+    t.add_cleanup(resetState);
+    button.setAttribute("commandfor", "whatever");
+
+    let called = false;
+    form.addEventListener("submit", (e) => {
+      e.preventDefault();
+      called = true;
+    }, { once: true });
+    button.click();
+    assert_false(called, "submit should not have been dispatched");
+  }, "clicking a button (implicit type) should NOT trigger a submit (with commandfor attribute)");
+
+  test((t) => {
+    t.add_cleanup(resetState);
+    button.setAttribute("command", "--foo");
+    button.setAttribute("commandfor", "whatever");
+
+    let called = false;
+    form.addEventListener("submit", (e) => {
+      e.preventDefault();
+      called = true;
+    }, { once: true });
+    button.click();
+    assert_false(called, "submit should not have been dispatched");
+  }, "clicking a button (implicit type) should NOT trigger a submit (with command and commandfor attribute)");
+
+  test((t) => {
+    t.add_cleanup(resetState);
+    button.setAttribute("command", "--foo");
+    button.setAttribute("type", "submit");
+
+    let called = false;
+    form.addEventListener("submit", (e) => {
+      e.preventDefault();
+      called = true;
+    }, { once: true });
+    button.click();
+    assert_true(called, "submit should have been dispatched");
+  }, "clicking a button (explicit type=submit) SHOULD trigger a submit (with command attribute)");
+
+  test((t) => {
+    t.add_cleanup(resetState);
+    button.setAttribute("commandfor", "whatever");
+    button.setAttribute("type", "submit");
+
+    let called = false;
+    form.addEventListener("submit", (e) => {
+      e.preventDefault();
+      called = true;
+    }, { once: true });
+    button.click();
+    assert_true(called, "submit should have been dispatched");
+  }, "clicking a button (explicit type=submit) SHOULD trigger a submit (with commandfor attribute)");
+
+  test((t) => {
+    t.add_cleanup(resetState);
+    button.setAttribute("command", "--foo");
+    button.setAttribute("commandfor", "whatever");
+    button.setAttribute("type", "submit");
+
+    let called = false;
+    form.addEventListener("submit", (e) => {
+      e.preventDefault();
+      called = true;
+    }, { once: true });
+    button.click();
+    assert_true(called, "submit should have been dispatched");
+  }, "clicking a button (explicit type=submit) SHOULD trigger a submit (with command and commandfor attribute)");
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/border-rendering-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/border-rendering-ref.html
new file mode 100644
index 00000000000..2ecb3a06bfe
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/border-rendering-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<div class=customizable-select-button>
+  <span class=customizable-select-selectedcontent>Option 1</span>
+</div>
+
+<style>
+.customizable-select-button {
+  border: 7px solid cornflowerblue;
+}
+</style>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/border-rendering.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/border-rendering.tentative.html
new file mode 100644
index 00000000000..c4025a153a6
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/border-rendering.tentative.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<meta name=fuzzy content="maxDifference=0-56;totalPixels=0-9">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=match href="border-rendering-ref.html">
+
+<style>
+select {
+  appearance: base-select;
+  border: 7px solid cornflowerblue;
+}
+</style>
+
+<select>
+  <option>Option 1</option>
+</select>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/native-popup-with-wrapper-div-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/native-popup-with-wrapper-div-ref.html
new file mode 100644
index 00000000000..6540e324b5d
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/native-popup-with-wrapper-div-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<select>
+  <option>one</option>
+  <hr>
+  <option>two</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.click(document.querySelector('select'));
+  document.activeElement.blur();
+  await new Promise(requestAnimationFrame);
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/native-popup-with-wrapper-div.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/native-popup-with-wrapper-div.tentative.html
new file mode 100644
index 00000000000..608fbb86546
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/native-popup-with-wrapper-div.tentative.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=match href="native-popup-with-wrapper-div-ref.html">
+<link rel=assert title="The native popup of a select should show options descending from a wrapper div">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<select>
+  <div>
+    <option>one</option>
+    <hr>
+    <option>two</option>
+  </div>
+</select>
+
+<script>
+(async () => {
+  await test_driver.click(document.querySelector('select'));
+  document.activeElement.blur();
+  await new Promise(requestAnimationFrame);
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/picker-and-slotted-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/picker-and-slotted-ref.html
new file mode 100644
index 00000000000..8ae5c7978dd
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/picker-and-slotted-ref.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel="author" title="L. David Baron" href="https://dbaron.org/">
+<link rel="author" title="Google" href="http://www.google.com/">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+select, select::picker(select) {
+  appearance: base-select;
+}
+select::picker(select) {
+  border: thick solid blue;
+  background: lime;
+  color: maroon;
+}
+</style>
+
+<select>
+  <option>one</option>
+  <option>two</option>
+</select>
+
+<script>
+
+(async () => {
+  await test_driver.bless();
+  document.querySelector('select').showPicker();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/picker-and-slotted.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/picker-and-slotted.tentative.html
new file mode 100644
index 00000000000..3e57757eb01
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/picker-and-slotted.tentative.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=match href="picker-and-slotted-ref.html">
+<link rel="author" title="L. David Baron" href="https://dbaron.org/">
+<link rel="author" title="Google" href="http://www.google.com/">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<div id="host">
+  <select>
+    <option>one</option>
+    <option>two</option>
+  </select>
+</div>
+
+<script>
+
+let host = document.getElementById("host");
+let shadow = host.attachShadow({mode: "open"});
+shadow.innerHTML = `
+  <style>
+    #myslot::slotted(select), #myslot::slotted(select)::picker(select) {
+      appearance: base-select;
+    }
+    #myslot::slotted(select)::picker(select) {
+      border: thick solid blue;
+      background: lime;
+      color: maroon;
+    }
+  </style>
+  <slot id="myslot"></slot>
+`;
+
+
+(async () => {
+  await test_driver.bless();
+  document.querySelector('select').showPicker();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/resources/customizable-select-styles.css b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/resources/customizable-select-styles.css
new file mode 100644
index 00000000000..65b3c39019a
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/resources/customizable-select-styles.css
@@ -0,0 +1,82 @@
+/* These are UA styles for select and customizable select. */
+/* TODO(crbug.com/41483940): These rules will probably change here:
+ * https://github.com/w3c/csswg-drafts/issues/10857 */
+
+.customizable-select-button, .customizable-select-popover {
+  box-sizing: border-box;
+}
+
+.customizable-select-popover {
+  box-sizing: border-box;
+  border: 1px solid;
+  padding: 0;
+  color: CanvasText;
+  background-color: Canvas;
+  margin: 0;
+  inset: auto;
+  min-inline-size: anchor-size(self-inline);
+  min-block-size: 1lh;
+  max-block-size: -webkit-fill-available; /* Can be removed when stretch ships */
+  max-block-size: stretch;
+  overflow: auto;
+  position-area: block-end span-inline-end;
+  position-try-order: most-block-size;
+  position-try-fallbacks:
+    block-start span-inline-end,
+    block-end span-inline-start,
+    block-start span-inline-start;
+}
+
+.customizable-select-option {
+  min-inline-size: 24px;
+  min-block-size: max(24px, 1lh);
+  padding-inline: 0.5em;
+  padding-block-end: 0;
+  display: flex;
+  place-items: center;
+  gap: 0.5em;
+  white-space: nowrap;
+}
+
+.customizable-select-option.disabled {
+  color: color-mix(in lab, currentColor 50%, transparent);
+}
+
+.customizable-select-option::before {
+  content: '\2713' / '';
+}
+.customizable-select-option:not(.selected)::before {
+  visibility: hidden;
+}
+
+.customizable-select-button {
+  color: inherit;
+  background-color: color-mix(in lab, currentColor 10%, transparent);
+  appearance: none;
+  padding-block: 0.25em;
+  padding-inline: 0.5em;
+  border: 1px solid currentColor;
+  border-radius: 0.25em;
+  cursor: default;
+  text-align: inherit;
+  /* TODO(crbug.com/41483940): Make display match the UA stylesheet. */
+  display: inline-flex;
+  gap: 0.5em;
+  overflow-x: hidden;
+  overflow-y: hidden;
+  /* min-size rules ensure that we meet accessibility guidelines for minimum target size.
+   * https://github.com/openui/open-ui/issues/1026
+   * https://www.w3.org/WAI/WCAG22/Understanding/target-size-minimum.html */
+  min-inline-size: 24px;
+  min-block-size: max(24px, 1lh);
+}
+
+.customizable-select-button::after {
+  content: counter(fake-counter-name, disclosure-open);
+}
+
+.customizable-select-legend {
+  font-weight: bolder;
+  padding-inline: 0.5em;
+  min-block-size: 1lh;
+}
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/resources/customizable-select-utils.js b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/resources/customizable-select-utils.js
new file mode 100644
index 00000000000..ed3f9642a86
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/resources/customizable-select-utils.js
@@ -0,0 +1,8 @@
+function populateFallbackButtonIcon() {
+  document.querySelectorAll('.customizable-select-button-icon').forEach(element => {
+    element.innerHTML =
+      `<svg viewBox="0 0 20 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+        <path d="M4 6 L10 12 L 16 6"></path>
+      </svg>`;
+  });
+}
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/resources/fallback-helper.js b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/resources/fallback-helper.js
new file mode 100644
index 00000000000..d2b9343e8d3
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/resources/fallback-helper.js
@@ -0,0 +1,102 @@
+const testSelectOptionText = `Long options, wider than select`;
+const frameWidth = 500;
+const frameHeight = 300;
+
+async function createFrameWithContent(content) {
+  const frame = document.createElement('iframe');
+  frame.width = frameWidth;
+  frame.height = frameHeight;
+  frame.srcdoc = content;
+  const loaded = new Promise(resolve => frame.addEventListener('load',resolve));
+  document.body.appendChild(frame);
+  await loaded;
+  return frame.contentDocument;
+}
+
+async function wait2Frames(doc) {
+  await new Promise(resolve => doc.defaultView.requestAnimationFrame(resolve));
+  await new Promise(resolve => doc.defaultView.requestAnimationFrame(resolve));
+}
+
+async function scroll(doc,x,y) {
+  await wait2Frames(doc);
+  doc.defaultView.scrollTo({left: x, top: y, behavior: "instant"});
+  await wait2Frames(doc);
+}
+
+async function capture(doc) {
+  await wait2Frames(doc);
+  document.documentElement.classList.remove('reftest-wait');
+}
+
+const commonStyleBlock = `
+  html {
+    scrollbar-width: none;
+  }
+  body {
+    width: 2000px;
+    height: 2000px;
+    /* Workaround for crbug.com/364669904. Shouldn't negatively affect other
+       implementations or the validity of this test. */
+    background: white;
+  }
+  .select {
+    position: relative;
+    top: 1000px;
+    left: 600px;
+  }
+  .select,::picker(select) {
+    appearance:base-select;
+  }
+`;
+
+async function generateTestFrame(numOptions,initialx,initialy) {
+  const singleOption = `<option>${testSelectOptionText}</option>`
+  const options = Array(numOptions).fill(singleOption).join('\n');
+  const content = `
+    <!DOCTYPE html>
+    <head>
+      <style>
+        ${commonStyleBlock}
+      </style>
+    </head>
+
+    <select class="select">
+      <option value="" selected>Select</option>
+      ${options}
+    </select>
+  `;
+  const doc = await createFrameWithContent(content);
+
+  await scroll(doc,initialx,initialy);
+  await test_driver.bless();
+  doc.querySelector('select').showPicker();
+  await capture(doc);
+}
+
+async function generateReferenceFrame(numOptions,initialx,initialy,extraStyleRules) {
+  const singleOption = `<div tabindex=0 class="customizable-select-option">${testSelectOptionText}</div>`
+  const options = Array(numOptions).fill(singleOption).join('\n');
+  const content = `
+    <!DOCTYPE html>
+    <head>
+      <link rel=stylesheet href="resources/customizable-select-styles.css">
+      <style>
+        ${commonStyleBlock}
+        ${extraStyleRules}
+      </style>
+    </head>
+
+    <div class="select customizable-select-button" id=button style="anchor-name:--button">
+      <span class=customizable-select-selectedoption>Select</span>
+    </div>
+    <div id=popover popover=auto anchor=button class=customizable-select-popover style="position-anchor:--button">
+      <div tabindex=0 autofocus class="customizable-select-option selected">Select</div>
+      ${options}
+    </div>
+  `;
+  const doc = await createFrameWithContent(content);
+  await scroll(doc,initialx,initialy);
+  doc.getElementById('popover').showPopover();
+  await capture(doc);
+}
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-active-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-active-ref.html
new file mode 100644
index 00000000000..9c62188a493
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-active-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<div class=customizable-select-button popovertarget=popover id=button>
+  <span class=customizable-select-selectedoption>option</span>
+</div>
+<div id=popover popover=auto anchor=button class=customizable-select-popover>
+  <div class="customizable-select-option selected">option</div>
+</div>
+
+<style>
+.customizable-select-button {
+  background-color: color-mix(in lab, currentColor 30%, transparent);
+}
+</style>
+
+<script>
+document.getElementById('popover').showPopover();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-active.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-active.tentative.html
new file mode 100644
index 00000000000..3873969a287
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-active.tentative.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<meta name=fuzzy content="maxDifference=0-29;totalPixels=0-1">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/w3c/csswg-drafts/issues/10909">
+<link rel=match href="select-appearance-active-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+
+<style>
+select, ::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <option>option</option>
+</select>
+
+<script>
+(async () => {
+  const select = document.querySelector('select');
+  await (new test_driver.Actions()
+    .pointerMove(1, 1, {origin: select})
+    .pointerDown())
+    .send();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-button-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-button-ref.html
new file mode 100644
index 00000000000..7b6a075237e
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-button-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<div class=customizable-select-button popovertarget=popover id=button>
+  <span class=customizable-select-selectedcontent>one</span>
+</div>
+<div id=popover popover=auto anchor=button class=customizable-select-popover>
+  <div class="customizable-select-option selected">one</div>
+  <div class=customizable-select-option>two</div>
+</div>
+
+<script>
+document.getElementById('popover').showPopover();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-custom-button.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-custom-button.tentative.html
new file mode 100644
index 00000000000..89683d29f6e
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-custom-button.tentative.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=match href="select-appearance-button-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+select, select::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <button>one</button>
+  <option>one</option>
+  <option>two</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.bless();
+  document.querySelector('select').showPicker();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-dark-mode-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-dark-mode-ref.html
new file mode 100644
index 00000000000..9d80e27d86d
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-dark-mode-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<style>
+:root {
+  color-scheme: dark;
+}
+</style>
+
+<div class=customizable-select-button popovertarget=popover id=button>
+  <span class=customizable-select-selectedcontent>one</span>
+</div>
+<div id=popover popover=auto anchor=button class=customizable-select-popover>
+  <div class="customizable-select-option selected">one</div>
+  <div class=customizable-select-option>two</div>
+</div>
+
+<script>
+document.getElementById('popover').showPopover();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-dark-mode.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-dark-mode.tentative.html
new file mode 100644
index 00000000000..d2ea44a20e4
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-dark-mode.tentative.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<meta name=fuzzy content="maxDifference=0-1;totalPixels=0-12">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=match href="select-appearance-dark-mode-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+:root {
+  color-scheme: dark;
+}
+select, select::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <option>one</option>
+  <option>two</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.bless();
+  document.querySelector('select').showPicker();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-default-button.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-default-button.tentative.html
new file mode 100644
index 00000000000..f0e17ff349b
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-default-button.tentative.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<meta name=fuzzy content="maxDifference=0-1;totalPixels=0-1">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=match href="select-appearance-button-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+select, select::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <option>one</option>
+  <option>two</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.bless();
+  document.querySelector('select').showPicker();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-disabled-option-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-disabled-option-ref.html
new file mode 100644
index 00000000000..0b59f2839b5
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-disabled-option-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<div class=customizable-select-button popovertarget=popover id=button>
+  <span class=customizable-select-selectedcontent>option</span>
+</div>
+<div id=popover popover=auto anchor=button class=customizable-select-popover>
+  <div class="customizable-select-option selected">option</div>
+  <div class="customizable-select-option disabled">disabled option</div>
+</div>
+
+<script>
+document.getElementById('popover').showPopover();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-disabled-option.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-disabled-option.tentative.html
new file mode 100644
index 00000000000..b4cd7ba67e0
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-disabled-option.tentative.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<meta name=fuzzy content="maxDifference=0-37;totalPixels=0-1">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=match href="select-appearance-disabled-option-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+select, select::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <option>option</option>
+  <option disabled>disabled option</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.bless();
+  document.querySelector('select').showPicker();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-ref.html
new file mode 100644
index 00000000000..fbc1b25e72b
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<script src="resources/fallback-helper.js"></script>
+
+<body>
+<script>
+(async () => {
+  await generateReferenceFrame(5,200,1000,`
+    [popover] {
+      position-area: bottom span-left;
+      position-try: unset;
+    }
+  `);
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-scroller-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-scroller-ref.html
new file mode 100644
index 00000000000..687e64da292
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-scroller-ref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<script src="resources/fallback-helper.js"></script>
+<body>
+<script>
+(async () => {
+  await generateReferenceFrame(15,200,1000,`
+    [popover] {
+      position-area: bottom span-left;
+      position-try: unset;
+      height: 100%;
+      overflow: auto;
+      align-self: stretch;
+    }
+  `);
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-scroller.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-scroller.tentative.html
new file mode 100644
index 00000000000..77f97efab21
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left-scroller.tentative.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=author href="mailto:masonf@chromium.org">
+<link rel=match href="select-appearance-fallback-bottom-left-scroller-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/fallback-helper.js"></script>
+<body>
+<script>
+(async () => {
+  await generateTestFrame(15,200,1000);
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left.tentative.html
new file mode 100644
index 00000000000..c8fa2f60d24
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-left.tentative.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=author href="mailto:masonf@chromium.org">
+<link rel=match href="select-appearance-fallback-bottom-left-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/fallback-helper.js"></script>
+
+<body>
+<script>
+(async () => {
+  await generateTestFrame(5,200,1000);
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-ref.html
new file mode 100644
index 00000000000..ba9867ddd51
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<script src="resources/fallback-helper.js"></script>
+
+<body>
+<script>
+(async () => {
+  await generateReferenceFrame(5,600,1000,`
+    [popover] {
+      position-area: bottom span-right;
+      position-try: unset;
+    }
+  `);
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-scroller-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-scroller-ref.html
new file mode 100644
index 00000000000..97af58d6d38
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-scroller-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<script src="resources/fallback-helper.js"></script>
+
+<body>
+<script>
+(async () => {
+  await generateReferenceFrame(15,600,1000,`
+    [popover] {
+      position-area: bottom span-right;
+      position-try: unset;
+      height: 100%;
+      overflow: auto;
+      align-self: stretch;
+    }
+  `);
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-scroller.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-scroller.tentative.html
new file mode 100644
index 00000000000..b7eefc25585
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right-scroller.tentative.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=author href="mailto:masonf@chromium.org">
+<link rel=match href="select-appearance-fallback-bottom-right-scroller-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/fallback-helper.js"></script>
+
+<body>
+<script>
+(async () => {
+  await generateTestFrame(15,600,1000);
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right.tentative.html
new file mode 100644
index 00000000000..9ce12bc20e7
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-bottom-right.tentative.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=author href="mailto:masonf@chromium.org">
+<link rel=match href="select-appearance-fallback-bottom-right-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/fallback-helper.js"></script>
+
+<body>
+<script>
+(async () => {
+  await generateTestFrame(5,600,1000);
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-ref.html
new file mode 100644
index 00000000000..e325f74ef99
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<script src="resources/fallback-helper.js"></script>
+
+<body>
+<script>
+(async () => {
+  await generateReferenceFrame(5,200,800,`
+    [popover] {
+      position-area: top span-left;
+      position-try: unset;
+    }
+  `);
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-scroller-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-scroller-ref.html
new file mode 100644
index 00000000000..3822fb30f28
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-scroller-ref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<script src="resources/fallback-helper.js"></script>
+<body>
+<script>
+(async () => {
+  await generateReferenceFrame(15,200,800,`
+    [popover] {
+      position-area: top span-left;
+      position-try: unset;
+      height: 100%;
+      overflow: auto;
+      align-self: stretch;
+    }
+  `);
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-scroller.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-scroller.tentative.html
new file mode 100644
index 00000000000..3f8358f6540
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left-scroller.tentative.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=author href="mailto:masonf@chromium.org">
+<link rel=match href="select-appearance-fallback-top-left-scroller-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/fallback-helper.js"></script>
+<body>
+<script>
+(async () => {
+  await generateTestFrame(15,200,800);
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left.tentative.html
new file mode 100644
index 00000000000..6e276aef8d2
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-left.tentative.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=author href="mailto:masonf@chromium.org">
+<link rel=match href="select-appearance-fallback-top-left-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/fallback-helper.js"></script>
+
+<body>
+<script>
+(async () => {
+  await generateTestFrame(5,200,800);
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-ref.html
new file mode 100644
index 00000000000..3b1260427f7
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<script src="resources/fallback-helper.js"></script>
+
+<body>
+<script>
+(async () => {
+  await generateReferenceFrame(5,600,800,`
+    [popover] {
+      position-area: top span-right;
+      position-try: unset;
+    }
+  `);
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-scroller-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-scroller-ref.html
new file mode 100644
index 00000000000..54884616095
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-scroller-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<script src="resources/fallback-helper.js"></script>
+
+<body>
+<script>
+(async () => {
+  await generateReferenceFrame(15,600,800,`
+    [popover] {
+      position-area: top span-right;
+      position-try: unset;
+      height: 100%;
+      overflow: auto;
+      align-self: stretch;
+    }
+  `);
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-scroller.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-scroller.tentative.html
new file mode 100644
index 00000000000..4d04a7caa9c
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right-scroller.tentative.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=author href="mailto:masonf@chromium.org">
+<link rel=match href="select-appearance-fallback-top-right-scroller-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/fallback-helper.js"></script>
+
+<body>
+<script>
+(async () => {
+  await generateTestFrame(15,600,800);
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right.tentative.html
new file mode 100644
index 00000000000..b0c4c510e7d
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-fallback-top-right.tentative.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=author href="mailto:masonf@chromium.org">
+<link rel=match href="select-appearance-fallback-top-right-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="resources/fallback-helper.js"></script>
+
+<body>
+<script>
+(async () => {
+  await generateTestFrame(5,600,800);
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-font-inheriting-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-font-inheriting-ref.html
new file mode 100644
index 00000000000..6321281fa8f
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-font-inheriting-ref.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<div class="customizable-select-button open" popovertarget=popover id=button>
+  <span class=customizable-select-selectedcontent>one</span>
+</div>
+<div id=popover popover=auto anchor=button class=customizable-select-popover>
+  <div class="customizable-select-option selected">one</div>
+  <div class=customizable-select-option>two</div>
+</div>
+
+<style>
+body {
+  font-style: italic !important;
+  font-weight: bold !important;
+  font-stretch: expanded !important;
+  font-size: 13px !important;
+  font-family: monospace !important;
+}
+</style>
+
+<script>
+document.getElementById('popover').showPopover();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-font-inheriting.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-font-inheriting.tentative.html
new file mode 100644
index 00000000000..f90e7c8896f
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-font-inheriting.tentative.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<meta name=fuzzy content="maxDifference=0-50;totalPixels=0-8">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=match href="select-appearance-font-inheriting-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+select, select::picker(select) {
+  appearance: base-select;
+}
+body {
+  font-style: italic;
+  font-weight: bold;
+  font-stretch: expanded;
+  font-size: 13px;
+  font-family: monospace;
+}
+</style>
+
+<select>
+  <option>one</option>
+  <option>two</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.bless();
+  document.querySelector('select').showPicker();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-hover-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-hover-ref.html
new file mode 100644
index 00000000000..fc658306da3
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-hover-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<div class=customizable-select-button popovertarget=popover id=button>
+  <span class=customizable-select-selectedoption>option</span>
+</div>
+
+<style>
+.customizable-select-button {
+  background-color: color-mix(in lab, currentColor 20%, transparent);
+}
+</style>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-hover.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-hover.tentative.html
new file mode 100644
index 00000000000..b5e24d07947
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-hover.tentative.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<meta name=fuzzy content="maxDifference=0-33;totalPixels=0-1">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/w3c/csswg-drafts/issues/10909">
+<link rel=match href="select-appearance-hover-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+
+<style>
+select, ::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <option>option</option>
+</select>
+
+<script>
+(async () => {
+  const select = document.querySelector('select');
+  await (new test_driver.Actions()
+    .pointerMove(1, 1, {origin: select}))
+    .send();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend-and-label.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend-and-label.tentative.html
new file mode 100644
index 00000000000..666dde2f60e
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend-and-label.tentative.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=mismatch href="select-appearance-optgroup-legend-ref.html">
+<meta name=assert content="The label attribute should take precedence over the legend element">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+select, select::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <option>one</option>
+  <optgroup label=label>
+    <legend>legend</legend>
+    <option>two</option>
+  </optgroup>
+</select>
+
+<script>
+(async () => {
+  await test_driver.bless();
+  document.querySelector('select').showPicker();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend-ref.html
new file mode 100644
index 00000000000..6d75f62efcd
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend-ref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<div class=customizable-select-button popovertarget=popover id=button>
+  <span class=customizable-select-selectedcontent>one</span>
+</div>
+<div id=popover popover=auto anchor=button class=customizable-select-popover>
+  <div class="customizable-select-option selected">one</div>
+  <div class=customizable-select-optgroup>
+    <div class=customizable-select-legend>legend</div>
+    <div class=customizable-select-option>two</div>
+  </div>
+</div>
+
+<script>
+document.getElementById('popover').showPopover();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend.tentative.html
new file mode 100644
index 00000000000..6b973bc84ec
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-legend.tentative.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<meta name=fuzzy content="maxDifference=0-1;totalPixels=0-1">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=match href="select-appearance-optgroup-legend-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+select, select::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <option>one</option>
+  <optgroup>
+    <legend>legend</legend>
+    <option>two</option>
+  </optgroup>
+</select>
+
+<script>
+(async () => {
+  await test_driver.bless();
+  document.querySelector('select').showPicker();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-rendering-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-rendering-ref.html
new file mode 100644
index 00000000000..25bb73492a8
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-rendering-ref.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<style>
+.border {
+  border: 2px solid green;
+}
+/* TODO(crbug.com/379886419): Remove these proprietary styles */
+.customizable-select-legend {
+  padding: 0px 2px 1px;
+  min-height: 1.2em;
+}
+</style>
+
+<div class=customizable-select-button id=button>
+  <span class=customizable-select-selectedcontent>one</span>
+</div>
+<div id=popover popover=auto anchor=button class=customizable-select-popover>
+  <div class="customizable-select-option selected">one</div>
+  <div class=customizable-select-optgroup>
+    <div class=customizable-select-legend>labelattribute</div>
+    <div class=customizable-select-option>two</div>
+    <div class=border>
+      <div class=customizable-select-option>three</div>
+    </div>
+  </div>
+  <div class=customizable-select-option>four</div>
+</div>
+
+<script>
+document.getElementById('popover').showPopover();
+</script>
+
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-rendering.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-rendering.tentative.html
new file mode 100644
index 00000000000..fd48e61731d
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-optgroup-rendering.tentative.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<meta name=fuzzy content="maxDifference=0-1;totalPixels=0-1">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=match href="select-appearance-optgroup-rendering-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+select, select::picker(select) {
+  appearance: base-select;
+}
+div {
+  border: 2px solid green;
+}
+</style>
+
+<select>
+  <option>one</option>
+  <optgroup label=labelattribute>
+    <option>two</option>
+    <div>
+      <option>three</option>
+    </div>
+  </optgroup>
+  <option>four</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.bless();
+  document.querySelector('select').showPicker();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-option-with-label.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-option-with-label.tentative.html
new file mode 100644
index 00000000000..c5abc14c386
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-option-with-label.tentative.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<meta name=fuzzy content="maxDifference=0-1;totalPixels=0-1">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/openui/open-ui/issues/1115">
+<link rel=match href="select-appearance-button-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+select, ::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <option label=one>text one</option>
+  <option label=two>text two</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.bless();
+  document.querySelector('select').showPicker();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-picker-select-border-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-picker-select-border-ref.html
new file mode 100644
index 00000000000..d09f9bc4216
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-picker-select-border-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<div class=customizable-select-button id=button>
+  <span class=customizable-select-selectedcontent>option</span>
+</div>
+<div id=popover popover=auto anchor=button class=customizable-select-popover>
+  <div class="customizable-select-option selected">option</div>
+</div>
+
+<style>
+.customizable-select-popover {
+  border: 5px solid red;
+}
+</style>
+
+<script>
+document.getElementById('popover').showPopover();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-picker-select-border.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-picker-select-border.tentative.html
new file mode 100644
index 00000000000..c708af4db1f
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-picker-select-border.tentative.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<meta name=fuzzy content="maxDifference=0-41;totalPixels=0-6">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=match href="select-appearance-picker-select-border-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+select, select::picker(select) {
+  appearance: base-select;
+}
+select::picker(select) {
+  border: 5px solid red;
+}
+</style>
+
+<select>
+  <option>option</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.bless();
+  document.querySelector('select').showPicker();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-switching-invalidation-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-switching-invalidation-ref.html
new file mode 100644
index 00000000000..29365305555
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-switching-invalidation-ref.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<style>
+.blue {
+  color: blue;
+}
+</style>
+
+<div class=customizable-select-button popovertarget=popover id=button>
+  <span class=customizable-select-selectedoption>button</span>
+</div>
+<div id=popover popover=auto anchor=button class=customizable-select-popover>
+  <div class="customizable-select-option selected">
+    <span class=blue>option</span> one
+  </div>
+  <div class=customizable-select-option>
+    <span class=blue>option</span> two
+  </div>
+</div>
+
+<script>
+document.getElementById('popover').showPopover();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-switching-invalidation.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-switching-invalidation.tentative.html
new file mode 100644
index 00000000000..fd67d013a56
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-switching-invalidation.tentative.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<meta name=fuzzy content="maxDifference=0-40;totalPixels=0-2">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=match href="select-appearance-switching-invalidation-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+.blue {
+  color: blue;
+}
+select.base, select.base::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <button>button</button>
+  <option>
+    <span class=blue>option</span> one
+  </option>
+  <option>
+    <span class=blue>option</span> two
+  </option>
+</select>
+
+<script>
+requestAnimationFrame(async () => {
+  await test_driver.bless();
+  const select = document.querySelector('select');
+  select.classList.add('base');
+  select.showPicker();
+  document.documentElement.classList.remove('reftest-wait');
+});
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-lr-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-lr-ref.html
new file mode 100644
index 00000000000..2e36e0a6c8e
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-lr-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<style>
+html {
+  writing-mode: vertical-lr;
+}
+</style>
+
+<div class=customizable-select-button id=button>
+  <div class=customizable-select-selectedcontent>one</div>
+</div>
+<div id=popover popover=auto anchor=button class=customizable-select-popover>
+  <div class="customizable-select-option selected">one</div>
+  <div class=customizable-select-option>two</div>
+</div>
+
+<script>
+document.getElementById('popover').showPopover();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-lr.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-lr.tentative.html
new file mode 100644
index 00000000000..4932ea37f72
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-lr.tentative.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=match href="select-appearance-writing-mode-vertical-lr-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+html {
+  writing-mode: vertical-lr;
+}
+select, select::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <option>one</option>
+  <option>two</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.bless();
+  document.querySelector('select').showPicker();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-rl-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-rl-ref.html
new file mode 100644
index 00000000000..e24aec5ad23
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-rl-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<style>
+html {
+  writing-mode: vertical-rl;
+}
+</style>
+
+<div class=customizable-select-button popovertarget=popover id=button>
+  <span class=customizable-select-selectedcontent>one</span>
+</div>
+<div id=popover popover=auto anchor=button class=customizable-select-popover>
+  <div class="customizable-select-option selected">one</div>
+  <div class=customizable-select-option>two</div>
+</div>
+
+<script>
+document.getElementById('popover').showPopover();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-rl.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-rl.tentative.html
new file mode 100644
index 00000000000..4b532a6f025
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-writing-mode-vertical-rl.tentative.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=match href="select-appearance-writing-mode-vertical-rl-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+html {
+  writing-mode: vertical-rl;
+}
+select, select::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <option>one</option>
+  <option>two</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.bless();
+  document.querySelector('select').showPicker();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-wrong-picker-argument.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-wrong-picker-argument.tentative.html
new file mode 100644
index 00000000000..a5ca3faea25
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-appearance-wrong-picker-argument.tentative.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/w3c/csswg-drafts/issues/10440">
+<link rel=mismatch href="select-appearance-button-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+select {
+  appearance: base-select;
+}
+select::picker(foo) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <option>one</option>
+  <option>two</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.click(document.querySelector('select'));
+  await new Promise(requestAnimationFrame);
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-events.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-events.tentative.html
index fcf53233f18..a1f98bc0530 100644
--- a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-events.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-events.tentative.html
@@ -142,14 +142,18 @@
       eventList = [];
 
       // Click on an option, with preventDefault
-      wrapper.addEventListener('click',(e) => e.preventDefault(),{once:true});
+      wrapper.addEventListener('mouseup',(e) => e.preventDefault(),{once:true});
       assert_equals(select.selectedOptions[0].innerText,'two');
       await test_driver.click(option1);
       assert_true(select.matches(':open'),'click should be cancelled');
       assert_events([
         'pointerdown on option1 at select', 'pointerdown on option1 at wrapper',
         'mousedown on option1 at select', 'mousedown on option1 at wrapper',
-        'click on option1 at select', 'click on option1 at wrapper',
+        'focusout on option2 at select', 'focusout on option2 at wrapper',
+        'focusin on select at select', 'focusin on select at wrapper',
+        'pointerup on option1 at select', 'pointerup on option1 at wrapper',
+        'mouseup on option1 at select', 'mouseup on option1 at wrapper',
+        'click on option1 at select', 'click on option1 at wrapper'
       ],'click option, with preventDefault');
 
       // Click on an option, no preventDefault
@@ -159,11 +163,11 @@
       assert_events([
         'pointerdown on option1 at select', 'pointerdown on option1 at wrapper',
         'mousedown on option1 at select', 'mousedown on option1 at wrapper',
-        'click on option1 at select', 'click on option1 at wrapper',
+        'pointerup on option1 at select', 'pointerup on option1 at wrapper',
+        'mouseup on option1 at select', 'mouseup on option1 at wrapper',
         'input on select at select', 'input on select at wrapper',
         'change on select at select', 'change on select at wrapper',
-        'focusout on option2 at select', 'focusout on option2 at wrapper',
-        'focusin on select at select', 'focusin on select at wrapper'
+        'click on option1 at select', 'click on option1 at wrapper'
       ],'click option, no preventDefault');
     },`Events, ${wrapper.dataset.description}`);
   });
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-explicit-size-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-explicit-size-ref.tentative.html
new file mode 100644
index 00000000000..91066653a30
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-explicit-size-ref.tentative.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+<div class="customizable-select-button open" style="anchor-name:--button" popovertarget=popover id=button>
+  <span class=customizable-select-selectedcontent>option</span>
+</div>
+<div id=popover popover=auto style="position-anchor:--button" class=customizable-select-popover>
+  <div class="customizable-select-option selected">one</div>
+  <div class=customizable-select-option>two</div>
+</div>
+
+<style>
+  button {
+    width: 400px;
+    height: 50px;
+  }
+</style>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-explicit-size.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-explicit-size.tentative.html
new file mode 100644
index 00000000000..4fefc96c2be
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-explicit-size.tentative.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<!-- Tests that select respects explicit size -->
+<link rel=author href="mailto:pkotwicz@chromium.org">
+<link rel="match" href="select-explicit-size-ref.tentative.html">
+
+<style>
+select {
+  width:400px;
+  height:50px;
+}
+select, ::picker(select) {
+  appearance: base-select;
+}
+</style>
+<select>
+  <option>option</option>
+</select>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-font-size-ref.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-font-size-ref.tentative.html
new file mode 100644
index 00000000000..eb7867b554d
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-font-size-ref.tentative.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+<div class="customizable-select-button open" style="anchor-name:--button" popovertarget=popover id=button>
+  <span class=customizable-select-selectedcontent>option</span>
+</div>
+<div id=popover popover=auto style="position-anchor:--button" class=customizable-select-popover>
+</div>
+
+<style>
+  select {
+    font-size: 48px;
+  }
+</style>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-font-size.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-font-size.tentative.html
new file mode 100644
index 00000000000..3b6b65db071
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-font-size.tentative.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<!-- Tests that select respects explicit size -->
+<link rel=author href="mailto:pkotwicz@chromium.org">
+<link rel="match" href="select-font-size-ref.tentative.html">
+
+<style>
+select {
+  font-size:48px;
+}
+</style>
+<select>
+  <option>option</option>
+</select>
+
+<style>
+  select, ::picker(select) {
+    appearance: base-select;
+  }
+</style>
+
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-icon-color-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-icon-color-ref.html
new file mode 100644
index 00000000000..b351c80c273
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-icon-color-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<style>
+.customizable-select-button::after {
+  color: red;
+}
+</style>
+
+<div class=customizable-select-button>
+  <span class=customizable-select-selectedcontent>option</span>
+</div>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-icon-color.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-icon-color.tentative.html
new file mode 100644
index 00000000000..59f015b86b4
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-icon-color.tentative.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta name=fuzzy content="maxDifference=0-41;totalPixels=0-6">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/openui/open-ui/issues/881">
+<link rel=match href="select-icon-color-ref.html">
+
+<style>
+select {
+  appearance: base-select;
+}
+select::picker-icon {
+  color: red;
+}
+</style>
+
+<select>
+  <option>option</option>
+</select>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-multiple-base-appearance-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-multiple-base-appearance-ref.html
new file mode 100644
index 00000000000..18ad4ecc3fa
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-multiple-base-appearance-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<select multiple>
+  <option>one</option>
+</select>
+
+<select multiple size=2>
+  <option>one</option>
+  <option>two</option>
+  <option>three</option>
+  <option>four</option>
+</select>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-multiple-base-appearance.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-multiple-base-appearance.html
new file mode 100644
index 00000000000..5304ce8aa9a
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-multiple-base-appearance.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=match href="select-multiple-base-appearance-ref.html">
+
+<style>
+select, ::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select multiple>
+  <option>one</option>
+</select>
+
+<select multiple size=2>
+  <option>one</option>
+  <option>two</option>
+  <option>three</option>
+  <option>four</option>
+</select>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-only-button-opt-in.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-only-button-opt-in.tentative.html
new file mode 100644
index 00000000000..b010d15e8ad
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-only-button-opt-in.tentative.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/w3c/csswg-drafts/issues/10440">
+<link rel=mismatch href="select-appearance-button-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+select {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <option>one</option>
+  <option>two</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.click(document.querySelector('select'));
+  await new Promise(requestAnimationFrame);
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-only-picker-opt-in-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-only-picker-opt-in-ref.html
new file mode 100644
index 00000000000..67a0abe43f2
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-only-picker-opt-in-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<select>
+  <option>option</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.click(document.querySelector('select'));
+  await new Promise(requestAnimationFrame);
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-only-picker-opt-in.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-only-picker-opt-in.tentative.html
new file mode 100644
index 00000000000..51cdabe18b4
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-only-picker-opt-in.tentative.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/w3c/csswg-drafts/issues/10440">
+<link rel=match href="select-only-picker-opt-in-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+select::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <option>option</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.click(document.querySelector('select'));
+  await new Promise(requestAnimationFrame);
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-open-invalidation-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-open-invalidation-ref.html
new file mode 100644
index 00000000000..e0631712ef7
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-open-invalidation-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<style>
+.customizable-select-selectedoption {
+  color: green;
+}
+</style>
+
+<div class=customizable-select-button popovertarget=popover id=button>
+  <span class=customizable-select-selectedoption>button</span>
+</div>
+<div id=popover popover=auto anchor=button class=customizable-select-popover>
+  <div tabindex=0 class="customizable-select-option selected">one</div>
+  <div class=customizable-select-option>two</div>
+</div>
+
+<script>
+document.getElementById('popover').showPopover();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-open-invalidation.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-open-invalidation.tentative.html
new file mode 100644
index 00000000000..10a441703be
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-open-invalidation.tentative.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<meta name=fuzzy content="maxDifference=0-40;totalPixels=0-2">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=match href="select-open-invalidation-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+select > button {
+  color: red;
+}
+select:open > button {
+  color: green;
+}
+select, select::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <button>button</button>
+  <option>one</option>
+  <option>two</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.bless();
+  await new Promise(requestAnimationFrame);
+  try {
+    document.querySelector('select').showPicker();
+  } catch (error) {}
+  await new Promise(requestAnimationFrame);
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-option-images-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-option-images-ref.html
new file mode 100644
index 00000000000..9c675e4f210
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-option-images-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<div class=customizable-select-button popovertarget=popover id=button>
+  <span class=customizable-select-selectedoption>button</span>
+</div>
+<div id=popover popover=auto anchor=button class=customizable-select-popover>
+  <div tabindex=0 class="customizable-select-option selected"><img alt="" src="/images/green-16x16.png">green-16x16</div>
+  <div tabindex=0 class=customizable-select-option><img alt="" src="/images/red-16x16.png">red-16x16</div>
+</div>
+
+<script>
+document.getElementById('popover').showPopover();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-option-images.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-option-images.tentative.html
new file mode 100644
index 00000000000..b0c8f279b70
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-option-images.tentative.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<meta name=fuzzy content="maxDifference=0-40;totalPixels=0-2">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/issues/9799">
+<link rel=match href="select-option-images-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+select, select::picker(select) {
+  appearance: base-select;
+}
+</style>
+<select>
+  <button>button</button>
+<option><img alt="" src="/images/green-16x16.png">green-16x16</option>
+<option class=two><img alt="" src="/images/red-16x16.png">red-16x16</option>
+</select>
+
+<script>
+(async () => {
+  await test_driver.bless();
+  const select = document.querySelector('select');
+  select.showPicker();
+  // <img> elements should still be rendered after removing and re-appending
+  const option = document.querySelector('option.two');
+  option.remove();
+  select.appendChild(option);
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-popover-exit-animation-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-popover-exit-animation-ref.html
new file mode 100644
index 00000000000..994d3a5fb21
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-popover-exit-animation-ref.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<div>hover target</div>
+<div class=customizable-select-button popovertarget=popover id=button>
+  <span class=customizable-select-selectedcontent>option</span>
+</div>
+<div id=popover popover=auto anchor=button class=customizable-select-popover>
+  <div class="customizable-select-option selected">option</div>
+</div>
+
+<script>
+document.getElementById('popover').showPopover();
+</script>
+
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-popover-exit-animation.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-popover-exit-animation.tentative.html
new file mode 100644
index 00000000000..f047474d9b3
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-popover-exit-animation.tentative.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<meta name=fuzzy content="maxDifference=0-41;totalPixels=0-6">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=match href="select-popover-exit-animation-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/resources/testdriver-actions.js"></script>
+
+<div>hover target</div>
+<select>
+  <option>option</option>
+</select>
+
+<style>
+select,::picker(select) {
+  appearance: base-select;
+}
+select.animate::picker(select) {
+  transition: display 10000s allow-discrete, overlay 10000s allow-discrete;
+}
+</style>
+
+<script>
+(async () => {
+  const select = document.querySelector('select');
+  await test_driver.click(select);
+  await new Promise(requestAnimationFrame);
+  await new Promise(requestAnimationFrame);
+  select.classList.add('animate');
+  await test_driver.click(select);
+  select.blur();
+  await (new test_driver.Actions()
+    .pointerMove(1, 1, {origin: document.querySelector('div')}))
+    .send();
+  await new Promise(requestAnimationFrame);
+  await new Promise(requestAnimationFrame);
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-second-child-button-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-second-child-button-ref.html
new file mode 100644
index 00000000000..636d0514c45
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-second-child-button-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+
+<div class=customizable-select-button popovertarget=popover id=button>
+  <span class=customizable-select-selectedcontent>option</span>
+</div>
+<div id=popover popover=auto anchor=button class=customizable-select-popover>
+  <div class="customizable-select-option selected">option</div>
+  <button>button</button>
+</div>
+
+<script>
+document.getElementById('popover').showPopover();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-second-child-button.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-second-child-button.tentative.html
new file mode 100644
index 00000000000..ae216294ee5
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-second-child-button.tentative.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html class=reftest-wait>
+<meta name=fuzzy content="maxDifference=0-37;totalPixels=0-1">
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/whatwg/html/pull/10629">
+<link rel=match href="select-second-child-button-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+
+<style>
+select, ::picker(select) {
+  appearance: base-select;
+}
+</style>
+
+<select>
+  <option>option</option>
+  <button>button</button>
+</select>
+
+<script>
+(async () => {
+  await test_driver.bless();
+  document.querySelector('select').showPicker();
+  document.documentElement.classList.remove('reftest-wait');
+})();
+</script>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-selected-value-behavior-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-selected-value-behavior-ref.html
new file mode 100644
index 00000000000..7260b242743
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-selected-value-behavior-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+<div class="customizable-select-button open" style="anchor-name:--button" popovertarget=popover id=button>
+  <span class=customizable-select-selectedcontent>option</span>
+</div>
+<div id=popover popover=auto style="position-anchor:--button" class=customizable-select-popover>
+</div>
+
+<style>
+  .customizable-select-selectedcontent {
+    color: blue;
+  }
+</style>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-selected-value-behavior.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-selected-value-behavior.tentative.html
new file mode 100644
index 00000000000..a55fbce7393
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-selected-value-behavior.tentative.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=match href="select-selected-value-behavior-ref.html">
+
+<select>
+  <selectedcontent style="color:blue"></selectedcontent>
+  <option>option</option>
+</select>
+
+<style>
+  select, ::picker(select) {
+    appearance: base-select;
+  }
+</style>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-text-only-ref.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-text-only-ref.html
new file mode 100644
index 00000000000..154fbad9ca3
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-text-only-ref.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<link rel=stylesheet href="resources/customizable-select-styles.css">
+<div class="customizable-select-button open" style="anchor-name:--button" popovertarget=popover id=button>
+  <span class=customizable-select-selectedcontent>option</span>
+</div>
+<div id=popover popover=auto style="position-anchor:--button" class=customizable-select-popover>
+</div>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-text-only.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-text-only.tentative.html
new file mode 100644
index 00000000000..a27ef3d1636
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/select-text-only.tentative.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<link rel=author href="mailto:jarhar@chromium.org">
+<link rel=help href="https://github.com/openui/open-ui/issues/702">
+<link rel=match href="select-text-only-ref.html">
+
+<select>
+  text node
+  <option>option</option>
+</select>
+
+<style>
+  select, ::picker(select) {
+    appearance: base-select;
+  }
+</style>
diff --git a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/selectedcontent.tentative.html b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/selectedcontent.tentative.html
index 77ff46a3b33..eef68a9237f 100644
--- a/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/selectedcontent.tentative.html
+++ b/tests/wpt/tests/html/semantics/forms/the-select-element/customizable-select/selectedcontent.tentative.html
@@ -40,28 +40,32 @@ promise_test(async () => {
     'The innerHTML of <selectedcontent> should initially match the innerHTML of the selected <option>.');
 
   select.value = 'two';
-  await new Promise(queueMicrotask);
   assert_equals(selectedcontent.innerHTML, optionTwo.innerHTML,
     'The innerHTML of <selectedcontent> should change after the selected option is changed.');
 
   let oldInnerHTML = optionTwo.innerHTML;
   spanTwo.textContent = 'new span';
-  await new Promise(queueMicrotask);
   assert_equals(selectedcontent.innerHTML, oldInnerHTML,
     '<selectedcontent> should not respond to <option> text content changes.');
 
   spanTwo.appendChild(document.createElement('div'));
-  await new Promise(queueMicrotask);
   assert_equals(selectedcontent.innerHTML, oldInnerHTML,
     '<selectedcontent> should not respond to new elements being added to descendants of <option>.');
 
   spanTwo.setAttribute('data-foo', 'bar');
-  await new Promise(queueMicrotask);
   assert_equals(selectedcontent.innerHTML, oldInnerHTML,
     '<selectedcontent> should not respond to attributes being added to descendants of <option>.');
 
+  select.value = select.value;
+  assert_equals(selectedcontent.innerHTML, optionTwo.innerHTML,
+    '<selectedcontent> should be updated in response to re-assigning select.value.');
+
+  spanTwo.firstElementChild.remove();
+  select.selectedIndex = select.selectedIndex;
+  assert_equals(selectedcontent.innerHTML, optionTwo.innerHTML,
+    '<selectedcontent> should be updated in response to re-assigning select.selectedIndex.');
+
   form.reset();
-  await new Promise(queueMicrotask);
   assert_equals(select.value, 'one',
     'form.reset() should change the selects value to one.');
   assert_equals(selectedcontent.innerHTML, optionOne.innerHTML,
@@ -70,14 +74,12 @@ promise_test(async () => {
   await test_driver.bless();
   select.showPicker();
   await test_driver.click(optionTwo);
-  await new Promise(queueMicrotask);
   assert_equals(select.value, 'two',
     'Clicking on another option should change select.value.');
   assert_equals(selectedcontent.innerHTML, optionTwo.innerHTML,
     'Clicking on an option element should update the <selectedcontent>.');
 
   selectedcontent.remove();
-  await new Promise(queueMicrotask);
   assert_equals(selectedcontent.innerHTML, '',
     'Removing the <selectedcontent> from the <select> should make it clear its contents.');
   button.appendChild(selectedcontent);
@@ -85,7 +87,6 @@ promise_test(async () => {
     'Re-inserting the <selectedcontent> should make it update its contents.');
 
   optionTwo.remove();
-  await new Promise(queueMicrotask);
   assert_equals(selectedcontent.innerHTML, optionOne.innerHTML,
     'The innerHTML of <selectedcontent> should be updated in response to selected <option> removal.');
   optionOne.remove();
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-popover-closedby-complex.tentative.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-popover-closedby-complex.tentative.html
index 0d300595287..472e0329236 100644
--- a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-popover-closedby-complex.tentative.html
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-popover-closedby-complex.tentative.html
@@ -11,24 +11,45 @@
 <script src="../../popovers/resources/popover-utils.js"></script>
 
 <div id=unrelated>Unrelated</div>
-<dialog id=dialogA closedby=any>Dialog 1
-  <div id=popoverA popover>Popover 1
-    <dialog id=dialogB closedby=any>Dialog 2
-      <div id=popoverB popover>Popover 2</div>
-    </dialog>
-  </div>
-</dialog>
 
-<style>
-  #dialogA { top: 100px; bottom: auto; padding:0; }
-  #popoverA { top: 150px; bottom: auto; padding:0; }
-  #dialogB { top: 200px; bottom: auto; padding:0; }
-  #popoverB { top: 250px; bottom: auto; padding:0; }
-  dialog { position: fixed; }
-</style>
+<div class=testcase data-description="normal DOM nesting">
+  <dialog class=dialogA closedby=any style="position: fixed; top: 100px; bottom: auto; padding:0;">Dialog 1
+    <div class=popoverA popover style="top: 150px; bottom: auto; padding:0;">Popover 1
+      <dialog class=dialogB closedby=any style="position: fixed; top: 200px; bottom: auto; padding:0;">Dialog 2
+        <div class=popoverB popover style="top: 250px; bottom: auto; padding:0;">Popover 2</div>
+      </dialog>
+    </div>
+  </dialog>
+</div>
+
+<div class=testcase data-description="same structure, but with shadow DOM slots">
+  <div>
+    <template shadowrootmode=open>
+      <dialog class=dialogA closedby=any style="position: fixed; top: 100px; bottom: auto; padding:0;">Dialog 1
+        <slot></slot>
+      </dialog>
+    </template>
+    <div>
+      <template shadowrootmode=open>
+        <div class=popoverA popover style="top: 150px; bottom: auto; padding:0;">Popover 1
+          <slot></slot>
+        </div>
+      </template>
+      <div>
+        <template shadowrootmode=open>
+          <dialog class=dialogB closedby=any style="position: fixed; top: 200px; bottom: auto; padding:0;">Dialog 2
+            <slot></slot>
+          </dialog>
+        </template>
+        <div class=popoverB popover style="top: 250px; bottom: auto; padding:0;">Popover 2</div>
+      </div>
+    </div>
+  </div>
+</div>
 
 <script>
 function openDialog(dialog,modal) {
+  assert_true(!!dialog);
   assert_false(dialog.open);
   if (modal) {
     dialog.showModal();
@@ -38,78 +59,100 @@ function openDialog(dialog,modal) {
   assert_true(dialog.open);
   assert_equals(dialog.matches(':modal'),modal);
 }
-function assertStates(dialogAExpected,popoverAExpected,
+function assertStates(elements,dialogAExpected,popoverAExpected,
     dialogBExpected,popoverBExpected) {
-  assert_equals(dialogA.open,dialogAExpected,
-    `First dialog should be ${dialogAExpected ? 'open' : 'closed'}`);
-  assert_equals(popoverA.matches(':popover-open'),popoverAExpected,
-    `First popover should be ${popoverAExpected ? 'open' : 'closed'}`);
-  assert_equals(dialogB.open,dialogBExpected,
-    `Second dialog should be ${dialogBExpected ? 'open' : 'closed'}`);
-  assert_equals(popoverB.matches(':popover-open'),popoverBExpected,
-    `Second popover should be ${popoverBExpected ? 'open' : 'closed'}`);
+  assert_equals(elements.dialogA.open,dialogAExpected,
+    `dialogA should be ${dialogAExpected ? 'open' : 'closed'}`);
+  assert_equals(elements.popoverA.matches(':popover-open'),popoverAExpected,
+    `popoverA should be ${popoverAExpected ? 'open' : 'closed'}`);
+  assert_equals(elements.dialogB.open,dialogBExpected,
+    `dialogB should be ${dialogBExpected ? 'open' : 'closed'}`);
+  assert_equals(elements.popoverB.matches(':popover-open'),popoverBExpected,
+    `popoverB should be ${popoverBExpected ? 'open' : 'closed'}`);
 }
-function openDialogPopoverStack(t,modalA,modalB) {
-  t.add_cleanup(() => {
-    dialogA.close();
-    popoverA.hidePopover();
-    dialogB.close();
-    popoverB.hidePopover();
+function findElements(wrapper) {
+  let elements = {};
+  if (!wrapper) {
+    return elements;
+  }
+  Array.from(wrapper.children).forEach(child => {
+    ['dialogA','popoverA','dialogB','popoverB'].forEach(pattern => {
+      if (child.matches(`.${pattern}`)) {
+        assert_false(elements.hasOwnProperty(pattern),'Multiple elements with the same class');
+        elements[pattern] = child;
+      }
+      elements = {...elements, ...findElements(child)};
+      elements = {...elements, ...findElements(child.shadowRoot)};
+    });
   });
-  openDialog(dialogA,modalA);
-  popoverA.showPopover();
-  openDialog(dialogB,modalB);
-  popoverB.showPopover();
-  assertStates(true,true,true,true);
+  return elements;
+}
+function openDialogPopoverStack(t,elements,modalA,modalB) {
+  t.add_cleanup(() => {
+    elements.dialogA.close();
+    elements.popoverA.hidePopover();
+    elements.dialogB.close();
+    elements.popoverB.hidePopover();
+  });
+  openDialog(elements.dialogA,modalA);
+  elements.popoverA.showPopover();
+  openDialog(elements.dialogB,modalB);
+  elements.popoverB.showPopover();
+  assertStates(elements,true,true,true,true);
 }
 
-[false,true].forEach(modalA => {
-  [false,true].forEach(modalB => {
-    const modalAString = modalA ? 'modal dialogA' : 'modeless dialogA';
-    const modalBString = modalB ? 'modal dialogB' : 'modeless dialogB';
-    promise_test(async (t) => {
-      openDialogPopoverStack(t,modalA,modalB);
-      await clickOn(unrelated);
-      // Clicking outside all is actually a click on a dialog backdrop.
-      // If dialogB is modal, it'll be dialogB, which is nested inside popoverA.
-      // Either way, both popoverB and dialogB should close.
-      assertStates(true,modalB,false,false);
-      await clickOn(unrelated);
-      // Clicking outside again should close the remaining two.
-      assertStates(false,false,false,false);
-    },`clicking outside all with ${modalAString} and ${modalBString}`);
+document.querySelectorAll('.testcase').forEach(testcase => {
+  const testDescription = `, ${testcase.dataset.description}`;
+  const elements = findElements(testcase);
+  assert_array_equals(Object.keys(elements).sort(),['dialogA','popoverA','dialogB','popoverB'].sort());
+  [false,true].forEach(modalA => {
+    [false,true].forEach(modalB => {
+      const modalAString = modalA ? 'modal dialogA' : 'modeless dialogA';
+      const modalBString = modalB ? 'modal dialogB' : 'modeless dialogB';
+      promise_test(async (t) => {
+        openDialogPopoverStack(t,elements,modalA,modalB);
+        await clickOn(unrelated);
+        // Clicking outside all is actually a click on a dialog backdrop.
+        // If dialogB is modal, it'll be dialogB, which is nested inside popoverA.
+        // Either way, both popoverB and dialogB should close.
+        assertStates(elements,true,modalB,false,false);
+        await clickOn(unrelated);
+        // Clicking outside again should close the remaining two.
+        assertStates(elements,false,false,false,false);
+      },`clicking outside all with ${modalAString} and ${modalBString}${testDescription}`);
 
-    promise_test(async (t) => {
-      openDialogPopoverStack(t,modalA,modalB);
-      await clickOn(popoverB);
-      // Clicking popoverB should keep everything open.
-      assertStates(true,true,true,true);
-    },`clicking popoverB with ${modalAString} and ${modalBString}`);
+      promise_test(async (t) => {
+        openDialogPopoverStack(t,elements,modalA,modalB);
+        await clickOn(elements.popoverB);
+        // Clicking popoverB should keep everything open.
+        assertStates(elements,true,true,true,true);
+      },`clicking popoverB with ${modalAString} and ${modalBString}${testDescription}`);
 
-    promise_test(async (t) => {
-      openDialogPopoverStack(t,modalA,modalB);
-      await clickOn(dialogB);
-      // Only popoverB should be light dismissed.
-      assertStates(true,true,true,false);
-    },`clicking dialogB with ${modalAString} and ${modalBString}`);
+      promise_test(async (t) => {
+        openDialogPopoverStack(t,elements,modalA,modalB);
+        await clickOn(elements.dialogB);
+        // Only popoverB should be light dismissed.
+        assertStates(elements,true,true,true,false);
+      },`clicking dialogB with ${modalAString} and ${modalBString}${testDescription}`);
 
-    promise_test(async (t) => {
-      openDialogPopoverStack(t,modalA,modalB);
-      await clickOn(popoverA);
-      // Both dialogB and popoverB should be light dismissed.
-      assertStates(true,true,false,false);
-    },`clicking popoverA with ${modalAString} and ${modalBString}`);
+      promise_test(async (t) => {
+        openDialogPopoverStack(t,elements,modalA,modalB);
+        await clickOn(elements.popoverA);
+        // Both dialogB and popoverB should be light dismissed.
+        assertStates(elements,true,true,false,false);
+      },`clicking popoverA with ${modalAString} and ${modalBString}${testDescription}`);
 
-    promise_test(async (t) => {
-      openDialogPopoverStack(t,modalA,modalB);
-      await clickOn(dialogA);
-      // If dialogB is modal, clicking on dialogA is actually clicking on dialogB,
-      // which means popoverB will stay open.
-      assertStates(true,modalB,false,false);
-      await clickOn(dialogA);
-      // The next click on dialogA should light dismiss popoverA.
-      assertStates(true,false,false,false);
-    },`clicking dialogA with ${modalAString} and ${modalBString}`);
+      promise_test(async (t) => {
+        openDialogPopoverStack(t,elements,modalA,modalB);
+        await clickOn(elements.dialogA);
+        // If dialogB is modal, clicking on dialogA is actually clicking on dialogB,
+        // which means popoverB will stay open.
+        assertStates(elements,true,modalB,false,false);
+        await clickOn(elements.dialogA);
+        // The next click on dialogA should light dismiss popoverA.
+        assertStates(elements,true,false,false,false);
+      },`clicking dialogA with ${modalAString} and ${modalBString}${testDescription}`);
+    });
   });
 });
 </script>
diff --git a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose.tentative.html b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose.tentative.html
index eb2270b861c..5cbad9c6519 100644
--- a/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose.tentative.html
+++ b/tests/wpt/tests/html/semantics/interactive-elements/the-dialog-element/dialog-requestclose.tentative.html
@@ -6,7 +6,6 @@
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-actions.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
-<script src="../../popovers/resources/popover-utils.js"></script>
 
 <dialog>Dialog</dialog>
 
@@ -29,18 +28,6 @@ function getSignal(t) {
   return signal;
 }
 
-// Run this test first, since the user activation from other tests will persist.
-promise_test(async (t) => {
-  t.add_cleanup(() => dialog.close());
-  const signal = getSignal(t);
-  dialog.addEventListener('cancel',(e) => {
-    e.preventDefault();
-  },{signal});
-  openDialog(/*modal*/true);
-  dialog.requestClose();
-  assert_false(dialog.open,'Without user activation, requestClose can\'t be cancelled');
-},`requestClose requires user activation in order to be cancelable`);
-
 async function setup(t,closedby) {
   t.add_cleanup(() => {
     dialog.close();
@@ -62,13 +49,8 @@ async function setup(t,closedby) {
     promise_test(async (t) => {
       await setup(t,closedby);
       openDialog(modal);
-      if (dialog.closedBy != "none") {
-        dialog.requestClose();
-        assert_false(dialog.open);
-      } else {
-        assert_throws_dom('InvalidStateError',() => dialog.requestClose());
-        assert_true(dialog.open);
-      }
+      dialog.requestClose();
+      assert_false(dialog.open);
     },`requestClose basic behavior ${testDescription}`);
 
     promise_test(async (t) => {
@@ -78,15 +60,11 @@ async function setup(t,closedby) {
       dialog.addEventListener('close',() => events.push('close'),{signal});
       openDialog(modal);
       assert_array_equals(events,[]);
-      if (dialog.closedBy != "none") {
-        dialog.requestClose();
-        assert_false(dialog.open);
-        assert_array_equals(events,['cancel'],'close is scheduled');
-        await new Promise(resolve => requestAnimationFrame(resolve));
-        assert_array_equals(events,['cancel','close']);
-      } else {
-        assert_throws_dom('InvalidStateError',() => dialog.requestClose());
-      }
+      dialog.requestClose();
+      assert_false(dialog.open);
+      assert_array_equals(events,['cancel'],'close is scheduled');
+      await new Promise(resolve => requestAnimationFrame(resolve));
+      assert_array_equals(events,['cancel','close']);
     },`requestClose fires both cancel and close ${testDescription}`);
 
     promise_test(async (t) => {
@@ -97,29 +75,17 @@ async function setup(t,closedby) {
       openDialog(modal);
       dialog.setAttribute('closedby',closedby);
       assert_array_equals(events,[]);
-      if (dialog.closedBy != "none") {
-        dialog.requestClose();
-        assert_false(dialog.open);
-      } else {
-        assert_throws_dom('InvalidStateError',() => dialog.requestClose());
-      }
-    },`changing closedby from 'none' to '${closedby}' for ${modal ? "modal" : "modeless"} dialog`);
-
-    promise_test(async (t) => {
-      const signal = await setup(t,closedby);
-      let events = [];
-      dialog.addEventListener('cancel',() => events.push('cancel'),{signal});
-      dialog.addEventListener('close',() => events.push('close'),{signal});
+      dialog.requestClose();
+      assert_false(dialog.open,'Adding closedby after dialog is open');
+      assert_array_equals(events,['cancel']);
+      events=[];
       openDialog(modal);
       dialog.removeAttribute('closedby');
       assert_array_equals(events,[]);
-      if (dialog.closedBy != "none") {
-        dialog.requestClose();
-        assert_false(dialog.open);
-      } else {
-        assert_throws_dom('InvalidStateError',() => dialog.requestClose());
-      }
-    },`Removing closedby when closedby='${closedby}' for ${modal ? "modal" : "modeless"} dialog`);
+      dialog.requestClose();
+      assert_false(dialog.open,'Removing closedby after dialog is open');
+      assert_array_equals(events,['cancel']);
+    },`closedby has no effect on dialog.requestClose() ${testDescription}`);
 
     if (dialog.closedBy != "none") {
       promise_test(async (t) => {
@@ -131,15 +97,24 @@ async function setup(t,closedby) {
           }
         },{signal});
         openDialog(modal);
-        await clickOn(dialog); // User activation
         dialog.requestClose();
         assert_true(dialog.open,'cancel event was cancelled - dialog shouldn\'t close');
         shouldPreventDefault = false;
-        await clickOn(dialog); // User activation
         dialog.requestClose();
         assert_false(dialog.open,'cancel event was not cancelled - dialog should now close');
       },`requestClose can be cancelled ${testDescription}`);
 
+      promise_test(async (t) => {
+        const signal = await setup(t,closedby);
+        dialog.addEventListener('cancel',(e) => e.preventDefault(),{signal});
+        openDialog(modal);
+        // No user activation here.
+        dialog.requestClose();
+        dialog.requestClose();
+        dialog.requestClose();
+        assert_true(dialog.open,'cancel event was cancelled - dialog shouldn\'t close');
+      },`requestClose avoids abuse prevention logic ${testDescription}`);
+
       promise_test(async (t) => {
         await setup(t,closedby);
         openDialog(modal);
diff --git a/tests/wpt/tests/html/semantics/invokers/invoketarget-button-event-dispatch.tentative.html b/tests/wpt/tests/html/semantics/invokers/invoketarget-button-event-dispatch.tentative.html
index ef870627a06..74148caa210 100644
--- a/tests/wpt/tests/html/semantics/invokers/invoketarget-button-event-dispatch.tentative.html
+++ b/tests/wpt/tests/html/semantics/invokers/invoketarget-button-event-dispatch.tentative.html
@@ -37,7 +37,7 @@
     assert_equals(event.isTrusted, true, "isTrusted");
     assert_equals(event.command, "--custom-command", "command");
     assert_equals(event.target, invokee, "target");
-    assert_equals(event.source, invokerbutton, "invoker");
+    assert_equals(event.source, invokerbutton, "source");
   }, "event dispatches on click");
 
   // valid custom invokeactions
@@ -56,7 +56,7 @@
         assert_equals(event.isTrusted, true, "isTrusted");
         assert_equals(event.command, command, "command");
         assert_equals(event.target, invokee, "target");
-        assert_equals(event.source, invokerbutton, "invoker");
+        assert_equals(event.source, invokerbutton, "source");
       }, `setting custom command property to ${command} (must include dash) sets event command`);
 
       promise_test(async function (t) {
@@ -72,7 +72,7 @@
         assert_equals(event.isTrusted, true, "isTrusted");
         assert_equals(event.command, command, "command");
         assert_equals(event.target, invokee, "target");
-        assert_equals(event.source, invokerbutton, "invoker");
+        assert_equals(event.source, invokerbutton, "source");
       }, `setting custom command attribute to ${command} (must include dash) sets event command`);
     },
   );
@@ -139,19 +139,47 @@
     let called = false;
     invokee.addEventListener("command", (e) => (called = true), { once: true });
     invokerbutton.setAttribute("form", "aform");
+    invokerbutton.removeAttribute("type");
     await clickOn(invokerbutton);
     assert_false(called, "event was not called");
-  }, "event does not dispatch if invoker is form associated without `type`");
+  }, "event does NOT dispatch if button is form associated, with implicit type");
+
+  promise_test(async function (t) {
+    t.add_cleanup(resetState);
+    let event;
+    invokee.addEventListener("command", (e) => (event = e), { once: true });
+    invokerbutton.setAttribute("form", "aform");
+    invokerbutton.setAttribute("type", "button");
+    await clickOn(invokerbutton);
+    assert_true(event instanceof CommandEvent, "event is CommandEvent");
+    assert_equals(event.type, "command", "type");
+    assert_equals(event.bubbles, false, "bubbles");
+    assert_equals(event.composed, true, "composed");
+    assert_equals(event.isTrusted, true, "isTrusted");
+    assert_equals(event.command, "--custom-command", "command");
+    assert_equals(event.target, invokee, "target");
+    assert_equals(event.source, invokerbutton, "source");
+  }, "event dispatches if button is form associated, with explicit type=button");
 
   promise_test(async function (t) {
     t.add_cleanup(resetState);
     let called = false;
     invokee.addEventListener("command", (e) => (called = true), { once: true });
     invokerbutton.setAttribute("form", "aform");
-    invokerbutton.setAttribute("type", "button");
+    invokerbutton.setAttribute("type", "submit");
     await clickOn(invokerbutton);
-    assert_true(called, "event was not called");
-  }, "event dispatches if invoker is form associated with `type=button`");
+    assert_false(called, "event was not called");
+  }, "event does NOT dispatch if button is form associated, with explicit type=submit");
+
+  promise_test(async function (t) {
+    t.add_cleanup(resetState);
+    let called = false;
+    invokee.addEventListener("command", (e) => (called = true), { once: true });
+    invokerbutton.setAttribute("form", "aform");
+    invokerbutton.setAttribute("type", "reset");
+    await clickOn(invokerbutton);
+    assert_false(called, "event was not called");
+  }, "event does NOT dispatch if button is form associated, with explicit type=reset");
 
   promise_test(async function (t) {
     svgInvokee = document.createElementNS("http://www.w3.org/2000/svg", "svg");
diff --git a/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/rel-opener-prevents-browsing-context-group-change.tentative.html b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/rel-opener-prevents-browsing-context-group-change.tentative.html
new file mode 100644
index 00000000000..94a9c2d3944
--- /dev/null
+++ b/tests/wpt/tests/html/semantics/links/links-created-by-a-and-area-elements/rel-opener-prevents-browsing-context-group-change.tentative.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<title>Prevent browsing context group changes</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/html/browsers/browsing-the-web/remote-context-helper/resources/remote-context-helper.js"></script>
+
+<body>
+<script>
+
+/*
+ * These tests are tentative. They are based on the following proposal:
+ * https://github.com/explainers-by-googlers/future-browsing-context-group-dependency-hint
+ */
+
+function navigateByRelOpenerAnchorToNew(remote) {
+  function navigateByRelOpenerAnchorExecutorCreator(remote) {
+    return (url) => {
+      return remote.navigate((url) => {
+        let anchor = document.createElement('a');
+        anchor.href = url;
+        anchor.rel = 'opener';
+        anchor.text = 'Link';
+        document.body.appendChild(anchor);
+        anchor.click();
+      }, [url]);
+    };
+  }
+
+  return remote.helper.createContext({
+        executorCreator: navigateByRelOpenerAnchorExecutorCreator(remote),
+      });
+}
+
+function navigateBySelfOpenToNew(remote) {
+  function navigateBySelfOpenExecutorCreator(remote) {
+    return (url) => {
+      return remote.navigate((url) => {
+        window.open(url, '_self', 'opener');
+      }, [url]);
+    };
+  }
+
+  return remote.helper.createContext({
+        executorCreator: navigateBySelfOpenExecutorCreator(remote),
+      });
+}
+
+async function runNoGroupChangeTest(performNavigation) {
+  const rcHelper = new RemoteContextHelper();
+  // This test harness cannot be in the same browsing context group as the
+  // navigating window, otherwise that would interfere with the test.
+  const rcWindow = await rcHelper.addWindow(undefined, { features: 'noopener' });
+
+  const rcWindow2 = await performNavigation(rcWindow);
+
+  const rcPopup = await rcWindow2.addWindow(undefined, { target: 'my_popup' });
+
+  assert_equals(await rcPopup.executeScript(() => {
+    window.previouslyOpened = true;
+    return window.name;
+  }), 'my_popup', 'popup created');
+
+  rcWindow2.historyBack();
+
+  // In order for the original page to find the popup by name, they must be in
+  // the same browsing context group.
+  assert_true(await rcWindow.executeScript(() => {
+    const popup = window.open('', 'my_popup');
+    return popup.previouslyOpened;
+  }), 'first page can access original popup');
+}
+
+promise_test(async t => {
+  await runNoGroupChangeTest((remote) => {
+    // Navigate away using rel=opener. The next page should remain in the same
+    // browsing context group.
+    return navigateByRelOpenerAnchorToNew(remote);
+  });
+}, 'rel=opener prevents browsing context group change');
+
+promise_test(async t => {
+  await runNoGroupChangeTest((remote) => {
+    // Navigate away using window.open with the opener window feature. The next
+    // page should remain in the same browsing context group.
+    return navigateBySelfOpenToNew(remote);
+  });
+}, 'opener window feature prevents browsing context group change');
+
+</script>
+</body>
diff --git a/tests/wpt/tests/html/semantics/popovers/popover-minimum-role.html b/tests/wpt/tests/html/semantics/popovers/popover-minimum-role.html
index 8606f983969..b46ca81fb52 100644
--- a/tests/wpt/tests/html/semantics/popovers/popover-minimum-role.html
+++ b/tests/wpt/tests/html/semantics/popovers/popover-minimum-role.html
@@ -5,30 +5,39 @@
 <link rel=help href="https://www.w3.org/TR/html-aam-1.0/#att-popover">
 <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/popover-utils.js"></script>
 
-<div popover id=popover>Popover</div>
-<div id=div style="display:block">Div</div>
-
+<body>
 <script>
-test((t) => {
-  const popover = document.querySelector('#popover');
-  assert_equals(popover.computedRole,'generic','Closed popover: role is generic');
-  t.add_cleanup(() => popover.hidePopover());
+async function assertRoleEquals(element,expectedRole,message) {
+  const actualRole = await test_driver.get_computed_role(element);
+  assert_equals(actualRole,expectedRole,message);
+}
+function initPopover(t) {
+  const popover = document.createElement('div');
+  t.add_cleanup(() => popover.remove());
+  document.body.appendChild(popover);
+  popover.popover = 'auto';
+  return popover;
+}
+promise_test(async (t) => {
+  const popover = initPopover(t);
+  await assertRoleEquals(popover,'none','role starts as none');
   popover.showPopover();
-  assert_equals(popover.computedRole,'group','With popover attribute, role is group');
-},'If specified on an element with an implicit role of generic, then the element\'s role instead maps to group.');
+  await assertRoleEquals(popover,'group','When the popover is showing, minimum role is group');
+},'The popover attribute, on an element with no implicit role, then the element\'s role instead maps to group.');
 
-test((t) => {
-  const div = document.querySelector('#div');
-  assert_equals(div.computedRole,'generic','Without popover attribute, role is generic');
-  div.setAttribute('popover','');
-  assert_true(isElementVisible(div),'element is visible due to display:block');
-  assert_equals(div.computedRole,'generic','With popover attribute, but before showPopover(), role is still generic');
-  t.add_cleanup(() => div.hidePopover());
-  div.showPopover();
-  assert_equals(div.computedRole,'group','When showing as a popover, role is group');
-  div.removeAttribute('style');
-  assert_equals(div.computedRole,'group','Including with style rule removed');
+promise_test(async (t) => {
+  const popover = initPopover(t);
+  await assertRoleEquals(popover,'none','role starts as none');
+  popover.style='display:block'; // Force visible
+  assert_true(isElementVisible(popover),'element is visible due to display:block');
+  await assertRoleEquals(popover,'group','With popover attribute, when visible (even before showPopover()), role is group');
+  popover.showPopover();
+  await assertRoleEquals(popover,'group','When showing as a popover, role is still group');
+  popover.removeAttribute('style');
+  await assertRoleEquals(popover,'group','Including with style rule removed');
 },'Dynamic changes to popover attribute should change the role.');
 </script>
diff --git a/tests/wpt/tests/html/syntax/speculative-parsing/expect-no-linked-resources/no-speculative-fetch.tentative.optional.html b/tests/wpt/tests/html/syntax/speculative-parsing/expect-no-linked-resources/no-speculative-fetch.tentative.optional.html
new file mode 100644
index 00000000000..33a14ff1466
--- /dev/null
+++ b/tests/wpt/tests/html/syntax/speculative-parsing/expect-no-linked-resources/no-speculative-fetch.tentative.optional.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Speculative parsing, expect-no-linked-resources Document-Policy</title>
+<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>
+  async function get_results(uuid) {
+    const response = await fetch(`/html/syntax/speculative-parsing/expect-no-linked-resources/resources/stash.py?action=get&uuid=${uuid}`);
+    return await response.text();
+  }
+
+  promise_test(async () => {
+    const uuid = token();
+
+    await test_driver.bless('Open a URL with expect-no-linked-resources Document-Policy');
+    const popup = window.open(`/html/syntax/speculative-parsing/expect-no-linked-resources/resources/no-speculative-fetch.sub.html?pipe=sub&uuid=${uuid}`, '_blank');
+    await new Promise(resolve => popup.addEventListener('load', resolve));
+
+    const result = await get_results(uuid);
+    assert_equals(result, '', 'speculative case fetched');
+  }, `expect-no-linked-resources hint was ignored`);
+</script>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/syntax/speculative-parsing/expect-no-linked-resources/resources/no-speculative-fetch.sub.html b/tests/wpt/tests/html/syntax/speculative-parsing/expect-no-linked-resources/resources/no-speculative-fetch.sub.html
new file mode 100644
index 00000000000..96169de1033
--- /dev/null
+++ b/tests/wpt/tests/html/syntax/speculative-parsing/expect-no-linked-resources/resources/no-speculative-fetch.sub.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<title>Navigating to a page with expect-no-linked-resources</title>
+
+<body>
+  <script>
+    document.write('<plaintext>');
+  </script>
+  <img
+    src="/html/syntax/speculative-parsing/expect-no-linked-resources/resources/stash.py?action=put&uuid={{GET[uuid]}}">
+</body>
\ No newline at end of file
diff --git a/tests/wpt/tests/html/syntax/speculative-parsing/expect-no-linked-resources/resources/no-speculative-fetch.sub.html.headers b/tests/wpt/tests/html/syntax/speculative-parsing/expect-no-linked-resources/resources/no-speculative-fetch.sub.html.headers
new file mode 100644
index 00000000000..ff1502d32fc
--- /dev/null
+++ b/tests/wpt/tests/html/syntax/speculative-parsing/expect-no-linked-resources/resources/no-speculative-fetch.sub.html.headers
@@ -0,0 +1 @@
+Document-Policy: expect-no-linked-resources
diff --git a/tests/wpt/tests/html/syntax/speculative-parsing/expect-no-linked-resources/resources/stash.py b/tests/wpt/tests/html/syntax/speculative-parsing/expect-no-linked-resources/resources/stash.py
new file mode 100644
index 00000000000..73e1f3abe5e
--- /dev/null
+++ b/tests/wpt/tests/html/syntax/speculative-parsing/expect-no-linked-resources/resources/stash.py
@@ -0,0 +1,11 @@
+import time
+
+def main(request, response):
+    if request.GET[b"action"] == b"put":
+        # Received result data from target page
+        request.server.stash.put(request.GET[b"uuid"], request.GET[b"uuid"], u'/expect-no-linked-resources/')
+        return u"ok"
+    else:
+        # Request for result data from test page
+        value = request.server.stash.take(request.GET[b"uuid"], u'/expect-no-linked-resources/')
+        return value
diff --git a/tests/wpt/tests/import-maps/external-import-map-errors.html b/tests/wpt/tests/import-maps/external-import-map-errors.html
new file mode 100644
index 00000000000..ea2a1c05875
--- /dev/null
+++ b/tests/wpt/tests/import-maps/external-import-map-errors.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  window.markupErrored = false;
+  window.markupLoaded = false;
+</script>
+<script src="/import-maps/resources/empty.js" type="importmap"
+ onload="window.markupLoaded = true;" onerror="window.markupErrored = true;">
+</script>
+<script>
+  promise_test(async () => {
+    await new Promise((resolve, reject) => {
+      const element = document.createElement("script");
+      element.onload = () => { reject("Got an unexpected load event"); };
+      element.onerror = () => { resolve("Got an error event"); };
+      element.src = "/import-maps/resources/empty.js";
+      element.type = "importmap";
+      document.head.appendChild(element);
+    })
+  }, "Test that an external import map fires an error event");
+
+  promise_test(async () => {
+    await new Promise((resolve, reject) => {
+      const element = document.createElement("script");
+      element.type = "importmap";
+      element.onload = () => { reject("Got an unexpected load event"); };
+      element.onerror = () => { resolve("Got an error event"); };
+      element.src = "/import-maps/resources/empty.js";
+      document.head.appendChild(element);
+    })
+  }, "Test that an external import map fires an error event, regardless of attribute order");
+
+  promise_test(async () => {
+    assert_true(window.markupErrored, "error");
+    assert_false(window.markupLoaded, "load");
+  }, "Test that an external import map in markup fires an error event");
+</script>
+</head>
diff --git a/tests/wpt/tests/infrastructure/crashtests/testdriver.html b/tests/wpt/tests/infrastructure/crashtests/testdriver.html
new file mode 100644
index 00000000000..24bb1ca19e1
--- /dev/null
+++ b/tests/wpt/tests/infrastructure/crashtests/testdriver.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html class="test-wait">
+<title>crashtests support testdriver.js</title>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<button>Complete the test</button>
+<script>
+  const button = document.querySelector("button");
+  button.addEventListener("click", () => {
+    document.documentElement.classList.remove("test-wait");
+  });
+  test_driver.click(button);
+</script>
diff --git a/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/testdriver-in-ref.html.ini b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/testdriver-in-ref.html.ini
new file mode 100644
index 00000000000..05850761b16
--- /dev/null
+++ b/tests/wpt/tests/infrastructure/metadata/infrastructure/reftest/testdriver-in-ref.html.ini
@@ -0,0 +1,5 @@
+[testdriver-in-ref.html]
+  disabled:
+    # https://github.com/web-platform-tests/wpt/issues/13183
+    if product == "firefox" or product == "firefox_android":
+      "marionette executor doesn't currently implement testdriver for reftests"
diff --git a/tests/wpt/tests/infrastructure/reftest/testdriver-child.html b/tests/wpt/tests/infrastructure/reftest/testdriver-child.html
new file mode 100644
index 00000000000..38ea532fee1
--- /dev/null
+++ b/tests/wpt/tests/infrastructure/reftest/testdriver-child.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  :root {
+    background-color: red;
+  }
+</style>
+<button>Turn green</button>
+<script>
+  test_driver.set_test_context(parent);
+  const button = document.querySelector("button");
+  button.addEventListener("click", () => {
+    button.remove();
+    document.documentElement.style.backgroundColor = "green";
+    test_driver.message_test("done");
+  });
+  test_driver.click(button);
+</script>
diff --git a/tests/wpt/tests/infrastructure/reftest/testdriver-iframe.sub.html b/tests/wpt/tests/infrastructure/reftest/testdriver-iframe.sub.html
new file mode 100644
index 00000000000..fb62009b9a1
--- /dev/null
+++ b/tests/wpt/tests/infrastructure/reftest/testdriver-iframe.sub.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>reftests support testdriver.js in iframes</title>
+<link rel="match" href="green.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  body {
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    height: 100%;
+  }
+  iframe {
+    position: absolute;
+    border: none;
+    width: inherit;
+    height: inherit;
+  }
+</style>
+<script>
+  // Attach the handler that completes the test before loading the calling iframe.
+  window.addEventListener("message", (evt) => {
+    if (evt.data === "done") {
+      document.documentElement.classList.remove("reftest-wait");
+    }
+  });
+</script>
+<iframe src="https://{{host}}:{{ports[https][1]}}/infrastructure/reftest/testdriver-child.html"></iframe>
diff --git a/tests/wpt/tests/infrastructure/reftest/testdriver-in-ref.html b/tests/wpt/tests/infrastructure/reftest/testdriver-in-ref.html
new file mode 100644
index 00000000000..8a1af46db35
--- /dev/null
+++ b/tests/wpt/tests/infrastructure/reftest/testdriver-in-ref.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<title>references support testdriver.js</title>
+<link rel="match" href="testdriver.html">
+<style>
+  :root {background-color:green}
+</style>
diff --git a/tests/wpt/tests/infrastructure/reftest/testdriver-print.html b/tests/wpt/tests/infrastructure/reftest/testdriver-print.html
new file mode 100644
index 00000000000..b4dc6c97609
--- /dev/null
+++ b/tests/wpt/tests/infrastructure/reftest/testdriver-print.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>print-reftests support testdriver.js</title>
+<link rel="match" href="reftest_match-print-ref.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  * { margin: 0; padding: 0; }
+  div { page-break-after: always; }
+</style>
+<button>Add a page</button>
+<div>page 1</div>
+<script>
+  const button = document.querySelector("button");
+  button.addEventListener("click", () => {
+    button.remove();
+    const page2 = document.createElement("div");
+    page2.innerText = "page 2";
+    document.body.appendChild(page2);
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  test_driver.click(button);
+</script>
diff --git a/tests/wpt/tests/infrastructure/reftest/testdriver.html b/tests/wpt/tests/infrastructure/reftest/testdriver.html
new file mode 100644
index 00000000000..d890d892627
--- /dev/null
+++ b/tests/wpt/tests/infrastructure/reftest/testdriver.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<title>reftests support testdriver.js</title>
+<link rel="match" href="green.html">
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<style>
+  :root {
+    background-color: red;
+  }
+</style>
+<button>Turn green</button>
+<script>
+  const button = document.querySelector("button");
+  button.addEventListener("click", () => {
+    button.remove();
+    document.documentElement.style.backgroundColor = "green";
+    document.documentElement.classList.remove("reftest-wait");
+  });
+  test_driver.click(button);
+</script>
diff --git a/tests/wpt/tests/input-events/input-events-range-exceptions.tentative.html b/tests/wpt/tests/input-events/input-events-range-exceptions.tentative.html
new file mode 100644
index 00000000000..d2a2b66bea9
--- /dev/null
+++ b/tests/wpt/tests/input-events/input-events-range-exceptions.tentative.html
@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<title>InputEvent.getTargetRanges() should return same array in various timings</title>
+<div contenteditable id="target"></div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+"use strict";
+
+// https://w3c.github.io/input-events/#events-inputevents is not clear that
+// the StaticRange-based APIs are internally represented as Range during event
+// propagation.  However, at least Blink does this, and it requires that an
+// exception thrown when converting a StaticRange to a Range propagates the
+// exception.
+
+let target = document.getElementById("target");
+
+test(() => {
+  target.innerHTML = "hello<span> </span>world";
+  let ev = new InputEvent("input",
+                          {
+                            data: "a",
+                            inputType: "insertText",
+                            targetRanges: [
+                              new StaticRange({
+                                                startContainer: target,
+                                                startOffset: 0,
+                                                endContainer: target,
+                                                endOffset: 3,
+                                              }),
+                            ],
+                          });
+  target.querySelector("span").remove();
+  target.normalize();
+  let ranges = ev.getTargetRanges();
+  assert_equals(ranges.length, 1);
+  assert_equals(ranges[0].startContainer, target);
+  assert_equals(ranges[0].startOffset, 0);
+  assert_equals(ranges[0].endContainer, target);
+  assert_equals(ranges[0].endOffset, 1);
+}, "valid target ranges in Element don't throw exceptions");
+
+test(() => {
+  target.innerHTML = "hello<span> </span>world";
+  assert_throws_dom(
+    "IndexSizeError",
+    () => {
+      // This should throw:
+      let ev = new InputEvent("input",
+                              {
+                                data: "a",
+                                inputType: "insertText",
+                                targetRanges: [
+                                  new StaticRange({
+                                                    startContainer: target,
+                                                    startOffset: 0,
+                                                    endContainer: target,
+                                                    endOffset: 5,
+                                                  }),
+                                ],
+                              });
+      // Run this in case it doesn't throw, to make sure it doesn't crash:
+      ev.getTargetRanges()[0].endOffset;
+    });
+}, "InputEvent constructor throws with invalid range in Element");
+
+test(() => {
+  target.innerHTML = "hello<span> </span>world";
+  let text = target.firstChild;
+  let ev = new InputEvent("input",
+                          {
+                            data: "a",
+                            inputType: "insertText",
+                            targetRanges: [
+                              new StaticRange({
+                                                startContainer: text,
+                                                startOffset: 0,
+                                                endContainer: text,
+                                                endOffset: 3,
+                                              }),
+                            ],
+                          });
+  text.replaceData(1, 1, "eee");
+  let ranges = ev.getTargetRanges();
+  assert_equals(ranges.length, 1);
+  assert_equals(ranges[0].startContainer, text);
+  assert_equals(ranges[0].startOffset, 0);
+  assert_equals(ranges[0].endContainer, text);
+  assert_equals(ranges[0].endOffset, 5);
+}, "valid target ranges in Text don't throw exceptions");
+
+test(() => {
+  target.innerHTML = "hello<span> </span>world";
+  let text = target.firstChild;
+  assert_throws_dom(
+    "IndexSizeError",
+    () => {
+      // This should throw:
+      let ev = new InputEvent("input",
+                              {
+                                data: "a",
+                                inputType: "insertText",
+                                targetRanges: [
+                                  new StaticRange({
+                                                    startContainer: text,
+                                                    startOffset: 0,
+                                                    endContainer: text,
+                                                    endOffset: 12,
+                                                  }),
+                                ],
+                              });
+      // Run this in case it doesn't throw, to make sure it doesn't crash:
+      ev.getTargetRanges()[0].endOffset;
+    });
+}, "InputEvent constructor throws with invalid range in Text");
+
+</script>
diff --git a/tests/wpt/tests/largest-contentful-paint/first-paint-equals-lcp-text.html b/tests/wpt/tests/largest-contentful-paint/first-paint-equals-lcp-text.html
index 50bccd072e2..c71e86f9c2a 100644
--- a/tests/wpt/tests/largest-contentful-paint/first-paint-equals-lcp-text.html
+++ b/tests/wpt/tests/largest-contentful-paint/first-paint-equals-lcp-text.html
@@ -14,7 +14,7 @@
     let largestContentfulPaintTime = 0;
     const observer = new PerformanceObserver(
       t.step_func(function(entryList) {
-        entryList.getEntries().forEach(entry => {
+      entryList.getEntries().forEach(entry => {
           if (entry.name === 'first-paint') {
             assert_equals(firstPaintTime, 0, 'Only one first-paint entry.');
             assert_equals(entry.entryType, 'paint');
diff --git a/tests/wpt/tests/lint.ignore b/tests/wpt/tests/lint.ignore
index 32c22fecfec..00fb7fd0201 100644
--- a/tests/wpt/tests/lint.ignore
+++ b/tests/wpt/tests/lint.ignore
@@ -768,15 +768,8 @@ HTML INVALID SYNTAX: mathml/crashtests/mozilla/411603-1.html
 HTML INVALID SYNTAX: quirks/percentage-height-calculation.html
 HTML INVALID SYNTAX: trusted-types/TrustedTypePolicyFactory-getAttributeType-namespace.html
 
-# Tests which include testdriver.js but aren't testharness.js tests
-TESTDRIVER-IN-UNSUPPORTED-TYPE: css/css-grid/grid-model/grid-layout-stale-001.html
-TESTDRIVER-IN-UNSUPPORTED-TYPE: css/css-grid/grid-model/grid-layout-stale-002.html
-TESTDRIVER-IN-UNSUPPORTED-TYPE: css/css-scroll-anchoring/fullscreen-crash.html
-TESTDRIVER-IN-UNSUPPORTED-TYPE: css/css-shadow-parts/interaction-with-nested-pseudo-class.html
-TESTDRIVER-IN-UNSUPPORTED-TYPE: css/css-text-decor/invalidation/text-decoration-thickness.html
-TESTDRIVER-IN-UNSUPPORTED-TYPE: css/css-view-transitions/hit-test-unpainted-element.html
-TESTDRIVER-IN-UNSUPPORTED-TYPE: css/css-view-transitions/hit-test-unrelated-element.html
-TESTDRIVER-IN-UNSUPPORTED-TYPE: css/selectors/remove-hovered-element.html
+# Tests that incorrectly include `testdriver.js`, which isn't supported for some
+# test types.
 TESTDRIVER-IN-UNSUPPORTED-TYPE: file-system-access/local_FileSystemBaseHandle-IndexedDB-manual.https.html
 TESTDRIVER-IN-UNSUPPORTED-TYPE: file-system-access/local_FileSystemBaseHandle-getUniqueId-manual.https.html
 TESTDRIVER-IN-UNSUPPORTED-TYPE: file-system-access/local_FileSystemBaseHandle-isSameEntry-manual.https.html
@@ -806,13 +799,9 @@ TESTDRIVER-IN-UNSUPPORTED-TYPE: file-system-access/local_FileSystemWritableFileS
 TESTDRIVER-IN-UNSUPPORTED-TYPE: file-system-access/showDirectoryPicker-manual.https.html
 TESTDRIVER-IN-UNSUPPORTED-TYPE: file-system-access/showOpenFilePicker-manual.https.html
 TESTDRIVER-IN-UNSUPPORTED-TYPE: file-system-access/showSaveFilePicker-manual.https.html
-TESTDRIVER-IN-UNSUPPORTED-TYPE: html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/crashtests/fieldset-middleclick.html
-TESTDRIVER-IN-UNSUPPORTED-TYPE: infrastructure/testdriver/click_child_crossorigin.html
-TESTDRIVER-IN-UNSUPPORTED-TYPE: infrastructure/testdriver/click_child_testdriver.html
 TESTDRIVER-IN-UNSUPPORTED-TYPE: mediacapture-streams/MediaStreamTrack-end-manual.https.html
 TESTDRIVER-IN-UNSUPPORTED-TYPE: payment-handler/change-payment-method-manual.https.html
 TESTDRIVER-IN-UNSUPPORTED-TYPE: payment-handler/change-shipping-address-manual.https.html
 TESTDRIVER-IN-UNSUPPORTED-TYPE: payment-handler/change-shipping-option-manual.https.html
 TESTDRIVER-IN-UNSUPPORTED-TYPE: payment-handler/payment-request-event-manual.https.html
 TESTDRIVER-IN-UNSUPPORTED-TYPE: payment-handler/supports-shipping-contact-delegation-manual.https.html
-TESTDRIVER-IN-UNSUPPORTED-TYPE: shadow-dom/crashtests/move-to-new-tree-1343016.html
diff --git a/tests/wpt/tests/long-animation-frame/tentative/loaf-paint-mixin.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-paint-mixin.html
new file mode 100644
index 00000000000..a0ef8df5bd3
--- /dev/null
+++ b/tests/wpt/tests/long-animation-frame/tentative/loaf-paint-mixin.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<meta charset=utf-8>
+<title>Long Animation Frame Timing: paint mixin</title>
+<meta name="timeout" content="long">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/utils.js"></script>
+
+<body>
+<h1>Long Animation Frame: paint mixin</h1>
+<div id="log"></div>
+<script>
+
+promise_test(async t => {
+    assert_implements("paintTime" in window.PerformanceLongAnimationFrameTiming.prototype, "PerformanceLongAnimationFrameTiming doesn't expose `paintTime`");
+    document.querySelector("#log").innerText = "Text";
+    const entry = await generate_long_animation_frame();
+    assert_equals(entry.paintTime, entry.startTime + entry.duration);
+    assert_greater_than(entry.presentationTime, entry.paintTime);
+}, 'A LoAF that generates a frame should have paintTime/presentationTime');
+</script>
+</body>
diff --git a/tests/wpt/tests/long-animation-frame/tentative/loaf-timeline.html b/tests/wpt/tests/long-animation-frame/tentative/loaf-timeline.html
index c434a26ef8d..721842e846b 100644
--- a/tests/wpt/tests/long-animation-frame/tentative/loaf-timeline.html
+++ b/tests/wpt/tests/long-animation-frame/tentative/loaf-timeline.html
@@ -14,14 +14,13 @@ promise_test(async t => {
     busy_wait(very_long_frame_duration);
     const is_loaf = entry => entry.duration >= very_long_frame_duration &&
       entry.entryType == "long-animation-frame";
-
-    await new Promise(resolve => t.step_timeout(resolve, 10));
+    await new Promise(resolve => t.step_timeout(resolve, 300));
     const entry_from_all = [...performance.getEntries()].find(is_loaf);
     const entry_by_type = [...performance.getEntriesByType("long-animation-frame")].find(is_loaf);
     const entry_by_name = [...performance.getEntriesByName("long-animation-frame")].find(is_loaf);
     assert_true(!!entry_from_all, "LoAF Entry found");
     assert_equals(entry_from_all, entry_by_type);
     assert_equals(entry_from_all, entry_by_name);
-}, 'LoAF entries are available in the performnace timeline');
+}, 'LoAF entries are available in the performance timeline');
 </script>
 </body>
diff --git a/tests/wpt/tests/long-animation-frame/tentative/resources/utils.js b/tests/wpt/tests/long-animation-frame/tentative/resources/utils.js
index b50fc5ced68..66b3cf40ba2 100644
--- a/tests/wpt/tests/long-animation-frame/tentative/resources/utils.js
+++ b/tests/wpt/tests/long-animation-frame/tentative/resources/utils.js
@@ -52,8 +52,8 @@ async function expect_long_frame(cb, t) {
     t.step_timeout(() => resolve("timeout"), waiting_for_long_frame_timeout));
   let resolve_loaf;
   const received_loaf = new Promise(resolve => { resolve_loaf = resolve; });
-  const generate_loaf = () =>
-    generate_long_animation_frame(very_long_frame_duration).then(resolve_loaf);
+  const generate_loaf = (duration = very_long_frame_duration) =>
+    generate_long_animation_frame(duration).then(resolve_loaf);
   window.generate_loaf_now = generate_loaf;
   await cb(t, generate_loaf);
   const entry = await Promise.race([
@@ -64,6 +64,21 @@ async function expect_long_frame(cb, t) {
   return entry;
 }
 
+function generate_long_animation_frame(duration = 120) {
+  busy_wait(duration / 2);
+  const reference_time = performance.now();
+  busy_wait(duration / 2);
+  return new Promise(resolve => new PerformanceObserver((entries, observer) => {
+    const entry = entries.getEntries().find(e =>
+        (e.startTime < reference_time) &&
+        (reference_time < (e.startTime + e.duration)));
+    if (entry) {
+      observer.disconnect();
+      resolve(entry);
+    }
+  }).observe({type: "long-animation-frame"}));
+}
+
 async function expect_long_frame_with_script(cb, predicate, t) {
   const entry = await expect_long_frame(cb, t);
   for (const script of entry.scripts ?? []) {
diff --git a/tests/wpt/tests/navigation-timing/nav2-test-timing-persistent.html b/tests/wpt/tests/navigation-timing/nav2-test-timing-persistent.html
index d0fc8c073bf..4a590b8fbb5 100644
--- a/tests/wpt/tests/navigation-timing/nav2-test-timing-persistent.html
+++ b/tests/wpt/tests/navigation-timing/nav2-test-timing-persistent.html
@@ -35,8 +35,8 @@
       'loadEventStart',
       'loadEventEnd',
       'redirectCount',
-      `redirectStart`,
-      `redirectEnd`,
+      'redirectStart',
+      'redirectEnd',
       'fetchStart',
       'responseEnd',
     ];
@@ -71,8 +71,44 @@
         verify_timing(pnt, "timing values should remain positive numbers after iframe is removed:")
         resolve();
       })
-    }, "iframe navigation times are persistent after the iframe is removed.");
+    }, "iframe navigation times are persistent after the iframe is removed. Part 1.");
 
+    function getOutOfLoadEventHandler(t) {
+      return new Promise(resolve => t.step_timeout(resolve, 0));
+    }
+
+    function waitForLoad(obj) {
+      return new Promise(resolve => {
+        obj.addEventListener("load", resolve, { once: true });
+      });
+    }
+
+    // 'type' entry should be persistent.
+    promise_test(async function (t) {
+      const iframe = document.createElement("iframe");
+      document.body.appendChild(iframe);
+
+      iframe.src = start_page;
+      await waitForLoad(iframe);
+      await getOutOfLoadEventHandler(t);
+      iframe.contentWindow.location.href = end_page;
+      await waitForLoad(iframe);
+
+      iframe.contentWindow.history.back();
+      await waitForLoad(iframe);
+
+      await new Promise(resolve => {
+        const entries = iframe.contentWindow.performance.getEntriesByType("navigation");
+        assert_equals(entries.length, 1, "Only one navigation time entry");
+        const pnt = entries[0];
+        assert_equals(pnt.name, iframe.contentWindow.location.toString(), "navigation name matches the window.location");
+        assert_true(pnt.name.endsWith("blank_page_green.html"), "navigation name is blank_page_green.html");
+        assert_equals(pnt.type, "back_forward", "type should be back_forward after going back to history");
+        iframe.remove();
+        assert_equals(pnt.type, "back_forward", "type should remain back_forward after iframe is removed");
+        resolve();
+      })
+    }, "iframe navigation times are persistent after the iframe is removed Part 2.");
 
   </script>
 </body>
diff --git a/tests/wpt/tests/paint-timing/paint-timing-mixin.html b/tests/wpt/tests/paint-timing/paint-timing-mixin.html
index 837d45620b6..65c1062a059 100644
--- a/tests/wpt/tests/paint-timing/paint-timing-mixin.html
+++ b/tests/wpt/tests/paint-timing/paint-timing-mixin.html
@@ -24,7 +24,6 @@
                 resolve(entry);
         }).observe({type: "paint"});
     });
-    await new Promise(resolve => img.addEventListener("load", () => resolve()));
     const entry = await performance_entry_promise;
     assert_greater_than(entry.paintTime, reference_time);
     assert_greater_than(entry.presentationTime, entry.paintTime);
diff --git a/tests/wpt/tests/pointerevents/pointerevent_click_on_chorded_mouse_button.tentative.html b/tests/wpt/tests/pointerevents/pointerevent_click_on_chorded_mouse_button.tentative.html
new file mode 100644
index 00000000000..4c643175107
--- /dev/null
+++ b/tests/wpt/tests/pointerevents/pointerevent_click_on_chorded_mouse_button.tentative.html
@@ -0,0 +1,91 @@
+<!doctype html>
+<!--
+  Tentative due to:
+  https://github.com/w3c/pointerevents/issues/530
+
+  TODO: Revisit the asserts below when the spec issue is resolved.
+-->
+<title>Click-like events on chorded button state changes</title>
+<meta name="viewport" content="width=device-width">
+<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>
+<script type="text/javascript" src="pointerevent_support.js"></script>
+<style>
+  div {
+    width: 100px;
+    height: 100px;
+    touch-action: none;
+    user-select: none;
+  }
+</style>
+<body onload="run()">
+  <div id="target"></div>
+  <div id="done"></div>
+</body>
+<script>
+  "use strict";
+
+  let event_log = [];
+
+  function eventLogger(e) {
+    event_log.push(e.type);
+  }
+
+  function run() {
+    var target = document.getElementById("target");
+    var done = document.getElementById("done");
+
+    ["click", "auxclick"].forEach(ename => {
+      target.addEventListener(ename, eventLogger);
+    });
+
+    promise_test(async test => {
+      event_log = [];
+
+      let done_click_promise = getEvent("click", done);
+
+      let actions = new test_driver.Actions();
+      actions = actions
+          .pointerMove(0,0, {origin:target})
+          .pointerDown({button:actions.ButtonType.LEFT})
+          .pointerDown({button:actions.ButtonType.MIDDLE})
+          .pointerUp({button:actions.ButtonType.MIDDLE})
+          .pointerUp({button:actions.ButtonType.LEFT})
+          .pointerMove(0,0, {origin:done})
+          .pointerDown()
+          .pointerUp();
+
+      await actions.send();
+      await done_click_promise;
+
+      assert_equals(event_log.toString(), "auxclick,click",
+          "received click-like events");
+    }, "Chorded button sequence L-down M-down M-up L-up");
+
+    promise_test(async test => {
+      event_log = [];
+
+      let done_click_promise = getEvent("click", done);
+
+      let actions = new test_driver.Actions();
+      actions = actions
+          .pointerMove(0,0, {origin:target})
+          .pointerDown({button:actions.ButtonType.MIDDLE})
+          .pointerDown({button:actions.ButtonType.LEFT})
+          .pointerUp({button:actions.ButtonType.LEFT})
+          .pointerUp({button:actions.ButtonType.MIDDLE})
+          .pointerMove(0,0, {origin:done})
+          .pointerDown()
+          .pointerUp();
+
+      await actions.send();
+      await done_click_promise;
+
+      assert_equals(event_log.toString(), "click,auxclick",
+          "received click-like events");
+    }, "Chorded button sequence M-down L-down L-up M-up");
+  }
+</script>
diff --git a/tests/wpt/tests/scroll-animations/css/animation-range-scroll-timeline.html b/tests/wpt/tests/scroll-animations/css/animation-range-scroll-timeline.html
new file mode 100644
index 00000000000..a1ff45e2a2f
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/css/animation-range-scroll-timeline.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<link rel="help" src="https://drafts.csswg.org/scroll-animations-1/#named-range-animation-declaration">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/scroll-animations/scroll-timelines/testcommon.js"></script>
+<title>The animation-range-* CSS properties for an animation associated with a scroll timeline</title>
+</head>
+<style>
+
+  @keyframes anim {
+    from { opacity: 0 }
+  }
+
+  #scroller {
+    overflow-y: scroll;
+    width: 100px;
+    height: 100px;
+  }
+
+  #target {
+    width: 100%;
+    height: 200%;
+
+    animation: anim auto linear;
+    animation-timeline: scroll();
+    animation-range-start: 10px;
+    animation-range-end: 80px;
+  }
+</style>
+<body>
+  <div id="scroller">
+    <div id="target"></div>
+  </div>
+</body>
+<script>
+
+const animation = document.getAnimations()[0];
+
+test(t => {
+  assert_equals(animation.rangeStart.offset.value, 10);
+  assert_equals(animation.rangeStart.offset.unit, "px");
+}, "The animation-range-start CSS property maps to Animation's 'rangeStart' property");
+
+test(t => {
+    assert_equals(animation.rangeEnd.offset.value, 80);
+    assert_equals(animation.rangeEnd.offset.unit, "px");
+}, "The animation-range-end CSS property maps to Animation's 'rangeEnd' property");
+
+promise_test(async t => {
+  await animation.ready;
+  assert_percents_equal(animation.startTime, 10);
+}, "The auto-aligned start time accounts for the animation-range-start property");
+
+promise_test(async t => {
+  await animation.ready;
+  assert_percents_equal(animation.effect.getComputedTiming().duration, 70);
+}, "The effect duration accounts for the animation-range-* properties");
+
+</script>
diff --git a/tests/wpt/tests/scroll-animations/css/siblings-with-anonymous-timelines.html b/tests/wpt/tests/scroll-animations/css/siblings-with-anonymous-timelines.html
new file mode 100644
index 00000000000..cc392856d0f
--- /dev/null
+++ b/tests/wpt/tests/scroll-animations/css/siblings-with-anonymous-timelines.html
@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<link rel="help" src="https://drafts.csswg.org/scroll-animations-1/#scroll-timelines-anonymous">
+<link rel="help" src="https://drafts.csswg.org/scroll-animations-1/#view-timelines-anonymous">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/scroll-animations/scroll-timelines/testcommon.js"></script>
+<title>The "animation-timeline" CSS property yields a unique anonymous timeline for siblings matching the same CSS rules</title>
+<style>
+
+  @keyframes anim {
+    from { opacity: 0 }
+  }
+
+  .scroller {
+    overflow-y: scroll;
+    width: 100px;
+    height: 100px;
+  }
+
+  .scroller > div {
+    width: 100%;
+    height: 100%;
+
+    animation: anim auto linear;
+  }
+
+  .scroller.scroll > div {
+    animation-timeline: scroll();
+  }
+
+  .scroller.view > div {
+    animation-timeline: view();
+  }
+
+</style>
+</head>
+<body>
+
+  <div class="scroller scroll">
+    <div></div>
+    <div></div>
+    <div></div>
+    <div></div>
+    <div></div>
+  </div>
+
+  <div class="scroller view">
+    <div></div>
+    <div></div>
+    <div></div>
+    <div></div>
+    <div></div>
+  </div>
+
+  <script>
+
+const types = ["scroll", "view"];
+
+types.forEach(type => {
+  test(t => {
+    const scroller = document.querySelector(`.scroller.${type}`);
+
+    const animations = scroller.getAnimations({ subtree: true });
+    const numberOfChildren = scroller.childElementCount;
+    assert_equals(animations.length, numberOfChildren, "There are as many animations as there are children");
+
+    const timelines = new Set;
+    for (const animation of animations)
+      timelines.add(animation.timeline);
+    assert_equals(timelines.size, numberOfChildren, `There are as many ${type} timelines as there are children`);
+  }, `Setting "animation-timeline: ${type}()" yields a unique ${type} timeline for siblings matching the same CSS rules`);
+});
+
+  </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/tests/storage-access-api/helpers.js b/tests/wpt/tests/storage-access-api/helpers.js
index a1fd02ab5e6..a698fac6491 100644
--- a/tests/wpt/tests/storage-access-api/helpers.js
+++ b/tests/wpt/tests/storage-access-api/helpers.js
@@ -279,12 +279,19 @@ function FetchFromFrame(frame, url) {
 
 // Makes a subresource request to the provided host in the given frame with
 // the mode set to 'no-cors'
-function NoCorsSubresourceCookiesFromFrame(frame, host) {
-  const url = `${host}/storage-access-api/resources/echo-cookie-header.py`;
+function NoCorsFetchFromFrame(frame, url) {
   return PostMessageAndAwaitReply(
     { command: "no-cors fetch", url }, frame.contentWindow);
 }
 
+// Makes a subresource request to the provided host in the given frame with
+// the mode set to 'no-cors', and returns the cookies that were included in the
+// request.
+function NoCorsSubresourceCookiesFromFrame(frame, host) {
+  const url = `${host}/storage-access-api/resources/echo-cookie-header.py`;
+  return NoCorsFetchFromFrame(frame, url);
+}
+
 // Tries to set storage access policy, ignoring any errors.
 //
 // Note: to discourage the writing of tests that assume unpartitioned cookie
diff --git a/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation-relax.sub.https.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation-relax.sub.https.window.js
index 7ccb9824e69..1cede45d59d 100644
--- a/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation-relax.sub.https.window.js
+++ b/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation-relax.sub.https.window.js
@@ -46,6 +46,8 @@
 
     assert_true(await FrameHasStorageAccess(frame), "innermost frame has storage access after refresh.");
     assert_true(await HasUnpartitionedCookie(frame), "innermost frame has access to cookies after refresh.");
+    let cookieOnLoad = await GetHTTPCookiesFromFrame(frame);
+    assert_true(cookieStringHasCookie("cookie", "unpartitioned", cookieOnLoad), "innermost frame has cookie in initial load");
   }, "Same-site-initiated same-origin navigations preserve storage access");
 
   promise_test(async (t) => {
@@ -59,7 +61,7 @@
     assert_false(await FrameHasStorageAccess(frame), "innermost frame has no storage access after refresh.");
     assert_false(await HasUnpartitionedCookie(frame), "innermost frame has no access to cookies after refresh.");
     let cookieOnLoad = await GetHTTPCookiesFromFrame(frame);
-    assert_false(cookieStringHasCookie("cookie", "unpartitioned", cookieOnLoad), "innermost frame has cookie in initial load");
+    assert_false(cookieStringHasCookie("cookie", "unpartitioned", cookieOnLoad), "innermost frame has no cookie in initial load");
   }, "Same-site-initiated cross-origin navigations do not preserve storage access");
 
 })();
diff --git a/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js b/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js
index 691c8c86b62..ce0d69cfaa5 100644
--- a/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js
+++ b/tests/wpt/tests/storage-access-api/requestStorageAccess-cross-origin-iframe-navigation.sub.https.window.js
@@ -44,6 +44,9 @@
 
     assert_true(await FrameHasStorageAccess(frame), "frame has storage access after refresh.");
     assert_true(await HasUnpartitionedCookie(frame), "frame has access to cookies after refresh.");
+
+    let cookieOnLoad = await GetHTTPCookiesFromFrame(frame);
+    assert_true(cookieStringHasCookie("cookie", "unpartitioned", cookieOnLoad), "innermost frame has cookie in initial load");
   }, "Self-initiated reloads preserve storage access");
 
   promise_test(async (t) => {
@@ -56,6 +59,8 @@
 
     assert_true(await FrameHasStorageAccess(frame), "frame has storage access after refresh.");
     assert_true(await HasUnpartitionedCookie(frame), "frame has access to cookies after refresh.");
+    let cookieOnLoad = await GetHTTPCookiesFromFrame(frame);
+    assert_true(cookieStringHasCookie("cookie", "unpartitioned", cookieOnLoad), "innermost frame has cookie in initial load");
   }, "Self-initiated same-origin navigations preserve storage access");
 
   promise_test(async (t) => {
@@ -71,6 +76,8 @@
 
     assert_false(await FrameHasStorageAccess(frame), "frame does not have storage access after refresh.");
     assert_false(await HasUnpartitionedCookie(frame), "frame has access to cookies after refresh.");
+    let cookieOnLoad = await GetHTTPCookiesFromFrame(frame);
+    assert_false(cookieStringHasCookie("cookie", "unpartitioned", cookieOnLoad), "innermost frame has no cookie in initial load");
   }, "Non-self-initiated same-origin navigations do not preserve storage access");
 
   promise_test(async (t) => {
@@ -83,5 +90,7 @@
 
     assert_false(await FrameHasStorageAccess(frame), "frame does not have storage access after refresh.");
     assert_false(await HasUnpartitionedCookie(frame), "frame has access to cookies after refresh.");
+    let cookieOnLoad = await GetHTTPCookiesFromFrame(frame);
+    assert_false(cookieStringHasCookie("cookie", "unpartitioned", cookieOnLoad), "innermost frame has no cookie in initial load");
   }, "Self-initiated cross-origin navigations do not preserve storage access");
 })();
diff --git a/tests/wpt/tests/storage-access-api/resources/handle-headers-non-retry.py b/tests/wpt/tests/storage-access-api/resources/handle-headers-non-retry.py
new file mode 100644
index 00000000000..b4b3c0ec83b
--- /dev/null
+++ b/tests/wpt/tests/storage-access-api/resources/handle-headers-non-retry.py
@@ -0,0 +1,20 @@
+import importlib
+header_helpers = importlib.import_module("storage-access-api.resources.header-helpers")
+
+def main(request, response):
+  request_params = request.GET
+  if b'key' in request_params:
+    key = request_params.first(b'key')
+  # Do not handle requests without a key parameter.
+  else:
+    return (400, [], b'')
+
+  # Handle load requests.
+  if b'load' in request_params:
+    response.headers.set(b'Activate-Storage-Access', b'load')
+
+  request.server.stash.put(header_helpers.make_stash_key(key, request_params),
+                           header_helpers.get_stashable_headers(request.headers),
+                           header_helpers.RETRIEVAL_PATH)
+
+  return header_helpers.make_response_body(request_params)
\ No newline at end of file
diff --git a/tests/wpt/tests/storage-access-api/resources/handle-headers-retry.py b/tests/wpt/tests/storage-access-api/resources/handle-headers-retry.py
new file mode 100644
index 00000000000..ca079489b18
--- /dev/null
+++ b/tests/wpt/tests/storage-access-api/resources/handle-headers-retry.py
@@ -0,0 +1,43 @@
+import importlib
+header_helpers = importlib.import_module("storage-access-api.resources.header-helpers")
+
+# Sets the `Activate-Storage-Access` response header to a `retry` value
+# corresponding to the supplied `allowed_origin`.
+def maybe_set_retry(allowed_origin, response):
+  if allowed_origin is None:
+    return
+
+  if allowed_origin == b'*':
+    retry_response = b'retry; allowed-origin=*'
+  elif allowed_origin == b'':
+    retry_response = b'retry'
+  else:
+    retry_response = b'retry; allowed-origin=\"' + allowed_origin + b'\"'
+  response.headers.set(b'Activate-Storage-Access', retry_response)
+
+def main(request, response):
+  request_params = request.GET
+  if b'key' in request_params:
+    key = request_params.first(b'key')
+  # Do not handle requests without a key parameter.
+  else:
+    return (400, [], b'')
+
+  allowed_origin = request_params.first(b'retry-allowed-origin', None)
+  storage_access_status = request.headers.get(b'sec-fetch-storage-access')
+
+  # If a request has been successfully retried and set to active, store its
+  # headers under a modified key so they can be retrieved independently of
+  # the initial request's headers.
+  if storage_access_status == b'active':
+      key += b'active'
+  maybe_set_retry(allowed_origin, response)
+
+  # Check if the request should redirect.
+  header_helpers.maybe_set_redirect(request_params, response, storage_access_status)
+
+  request.server.stash.put(header_helpers.make_stash_key(key, request_params),
+                           header_helpers.get_stashable_headers(request.headers),
+                           header_helpers.RETRIEVAL_PATH)
+
+  return header_helpers.make_response_body(request_params)
\ No newline at end of file
diff --git a/tests/wpt/tests/storage-access-api/resources/header-helpers.py b/tests/wpt/tests/storage-access-api/resources/header-helpers.py
new file mode 100644
index 00000000000..6909fd896ed
--- /dev/null
+++ b/tests/wpt/tests/storage-access-api/resources/header-helpers.py
@@ -0,0 +1,58 @@
+import hashlib
+import json
+
+RETRIEVAL_PATH = '/storage-access-api/resources/retrieve-storage-access-headers.py'
+
+def get_stashable_headers(headers):
+  def bytes_to_strings(d):
+    # Recursively convert bytes to strings in `d`.
+    if isinstance(d, (tuple,list,set)):
+      return [bytes_to_strings(x) for x in d]
+    elif isinstance(d, bytes):
+      return d.decode()
+    elif isinstance(d, dict):
+      return {bytes_to_strings(k): bytes_to_strings(v) for (k, v) in d.items()}
+    return d
+  return json.dumps(bytes_to_strings(headers))
+
+# Makes a string representation of the hash generated for the given key.
+def make_stash_key(key, request_params):
+  # Redirected requests stash their headers at a different key.
+  key += b'redirected' if b'redirected' in request_params else b''
+  return hashlib.md5(key).hexdigest()
+
+# Sets the response to redirect to the location passed by the request if its
+# parameters contain a `redirect-location` or a `once-active-redirect-location`
+# with an active `storage_access_status`.
+def maybe_set_redirect(request_params, response, storage_access_status):
+  if storage_access_status == b'active':
+    location = request_params.first(b'once-active-redirect-location', '')
+  else:
+    location = request_params.first(b'redirect-location', '')
+
+  if location:
+    response.status = 302
+    response.headers.set(b'Location', location)
+
+# Returns an HTML body with an embedded responder if one is included in
+# `request_params`, otherwise returns an empty byte-string.
+def make_response_body(request_params):
+  script = request_params.first(b'script', None)
+  if script is None:
+    return b''
+  return b"""
+    <!DOCTYPE html>
+  <meta charset="utf-8">
+  <title>Subframe with script</title>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testdriver.js"></script>
+  <script src="/resources/testdriver-vendor.js"></script>
+  <script>
+    var should_ack_load = false;
+  </script>
+
+  <body>
+  <script src="%s"></script>
+  </body>
+
+  """ % (script)
\ No newline at end of file
diff --git a/tests/wpt/tests/storage-access-api/resources/nested-handle-storage-access-headers.py b/tests/wpt/tests/storage-access-api/resources/nested-handle-storage-access-headers.py
new file mode 100644
index 00000000000..db0bf343573
--- /dev/null
+++ b/tests/wpt/tests/storage-access-api/resources/nested-handle-storage-access-headers.py
@@ -0,0 +1,5 @@
+import importlib
+header_helpers = importlib.import_module("storage-access-api.resources.header-helpers")
+
+def main(request, response):
+  return header_helpers.make_response_body(request.GET)
diff --git a/tests/wpt/tests/storage-access-api/resources/retrieve-storage-access-headers.py b/tests/wpt/tests/storage-access-api/resources/retrieve-storage-access-headers.py
new file mode 100644
index 00000000000..553c0c6dd4a
--- /dev/null
+++ b/tests/wpt/tests/storage-access-api/resources/retrieve-storage-access-headers.py
@@ -0,0 +1,17 @@
+import hashlib
+
+def main(request, response):
+  if b'key' in request.GET:
+    key = request.GET.first(b'key')
+  # Do not handle requests without a key parameter.
+  else:
+    return (400, [], b'')
+
+  # Convert the key from String to UUID valid String.
+  stash_key = hashlib.md5(key).hexdigest()
+
+  # Handle the header retrieval request.
+  headers = request.server.stash.take(stash_key)
+  if headers is None:
+    return (204, [], b'')
+  return (200, [], headers)
diff --git a/tests/wpt/tests/storage-access-api/storage-access-headers.tentative.https.sub.window.js b/tests/wpt/tests/storage-access-api/storage-access-headers.tentative.https.sub.window.js
new file mode 100644
index 00000000000..10719750174
--- /dev/null
+++ b/tests/wpt/tests/storage-access-api/storage-access-headers.tentative.https.sub.window.js
@@ -0,0 +1,487 @@
+// META: script=helpers.js
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+"use strict";
+
+// These are secure origins with different relations to the current document.
+const https_origin = 'https://{{host}}:{{ports[https][0]}}';
+const same_site = 'https://{{hosts[][www]}}:{{ports[https][0]}}';
+const cross_site = 'https://{{hosts[alt][]}}:{{ports[https][0]}}';
+const alt_cross_site = 'https://{{hosts[alt][www]}}:{{ports[https][0]}}';
+
+const responder_script = 'embedded_responder.js';
+const nested_path = '/storage-access-api/resources/nested-handle-storage-access-headers.py';
+const retry_path = '/storage-access-api/resources/handle-headers-retry.py';
+const non_retry_path = '/storage-access-api/resources/handle-headers-non-retry.py';
+
+function makeURL(key, domain, path, params) {
+    const request_params = new URLSearchParams(params);
+    request_params.append('key', key);
+    return domain + path + '?' + request_params.toString();
+}
+
+async function grantStorageAccessForEmbedSite(test, origin) {
+    const iframe_params = new URLSearchParams([['script', responder_script]]);
+    const iframe = await CreateFrame(origin +
+          '/storage-access-api/resources/script-with-cookie-header.py?' +
+          iframe_params.toString());
+    test.add_cleanup( async () => {
+        await SetPermissionInFrame(iframe,
+                                   [{ name: 'storage-access' }, 'prompt']);
+        iframe.parentNode.removeChild(iframe);
+    })
+    await SetPermissionInFrame(iframe,
+                                [{ name: 'storage-access' }, 'granted']);
+}
+
+// Sends a request whose headers can be read in cross-site contexts.
+async function sendReadableHeaderRequest(url) {
+    return fetch(url, {credentials: 'include', mode: 'no-cors'});
+}
+
+// Sends a request `resources/retrieve-storage-access-headers.py` and parses
+// the response as JSON. Will return `undefined` if no headers were set at the
+// given key, or if the headers have already been retrieved from that key.
+async function sendRetrieveRequest(key) {
+    const retrieval_path = '/storage-access-api/resources/retrieve-storage-access-headers.py?';
+    const request_params = new URLSearchParams([['key', key]]);
+    const response = await fetch(retrieval_path + request_params.toString());
+
+    return response.status !== 200 ? undefined : response.json();
+}
+
+// Checks that the values of `actual_headers` match those passed in the
+// `expected_headers` at their respective header keys. Headers with the value
+// of `undefined` in `expected_headers` are expected to be absent from
+// `actual_headers`.
+function assertHeaderValuesMatch(actual_headers, expected_headers) {
+    for (const [expected_name, expected_value] of Object.entries(
+                                                          expected_headers)) {
+      const actual_value = actual_headers[expected_name];
+      if (expected_value === undefined) {
+        assert_equals(actual_value, undefined);
+      } else {
+        assert_array_equals(actual_value, expected_value);
+      }
+    }
+}
+
+function addCommonCleanupCallback(test) {
+    test.add_cleanup(async () => {
+        await test_driver.delete_all_cookies();
+        await MaybeSetStorageAccess("*", "*", "allowed");
+      });
+}
+
+function retriedKey(key) {
+    return key + 'active';
+}
+
+function redirectedKey(key) {
+    return key + 'redirected';
+}
+
+promise_test(async (t) => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess("*", "*", "blocked");
+    addCommonCleanupCallback(t);
+
+    await fetch(makeURL(key, cross_site, non_retry_path),
+                {credentials: 'omit', mode: 'no-cors'});
+    const headers = await sendRetrieveRequest(key);
+    assertHeaderValuesMatch(headers, {'sec-fetch-storage-access': undefined});
+}, "Sec-Fetch-Storage-Access is omitted when credentials are omitted");
+
+promise_test(async (t) => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess("*", "*", "blocked");
+    addCommonCleanupCallback(t);
+
+    await sendReadableHeaderRequest(makeURL(key, cross_site, non_retry_path));
+    const headers = await sendRetrieveRequest(key);
+    assertHeaderValuesMatch(headers, {'sec-fetch-storage-access': ['none']});
+}, "Sec-Fetch-Storage-Access is `none` when unpartitioned cookies are unavailable.");
+
+promise_test(async (t) => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess("*", "*", "blocked");
+
+    // Create an iframe and grant it storage access permissions.
+    await grantStorageAccessForEmbedSite(t, cross_site);
+    // A cross-site request to the same site as the above iframe should have an
+    // `inactive` storage access status since a permission grant exists for the
+    // context.
+    await sendReadableHeaderRequest(makeURL(key, cross_site, non_retry_path));
+    const headers = await sendRetrieveRequest(key);
+    // We should see the origin header on the inactive case.
+    assertHeaderValuesMatch(headers, {'sec-fetch-storage-access': ['inactive'],
+                                      'origin': [https_origin]});
+}, "Sec-Fetch-Storage-Access is `inactive` when unpartitioned cookies are available but not in use.");
+
+promise_test(async (t) => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess("*", "*", "blocked");
+    await SetFirstPartyCookieAndUnsetStorageAccessPermission(cross_site);
+    addCommonCleanupCallback(t);
+
+    await grantStorageAccessForEmbedSite(t, cross_site);
+    await sendReadableHeaderRequest(makeURL(key, cross_site, retry_path,
+                                            [['retry-allowed-origin',
+                                              https_origin]]));
+    // Retrieve the pre-retry headers.
+    const headers = await sendRetrieveRequest(key);
+    // Unpartitioned cookie should not be included before the retry.
+    assertHeaderValuesMatch(headers, {'sec-fetch-storage-access': ['inactive'],
+                                      'origin': [https_origin], 'cookie': undefined});
+    // Retrieve the headers for the retried request.
+    const retried_headers = await sendRetrieveRequest(retriedKey(key));
+    // The unpartitioned cookie should have been included in the retry.
+    assertHeaderValuesMatch(retried_headers, {
+    'sec-fetch-storage-access': ['active'],
+        'origin': [https_origin],
+        'cookie': ['cookie=unpartitioned']
+    });
+}, "Sec-Fetch-Storage-Access is `active` after a valid retry with matching explicit allowed-origin.");
+
+promise_test(async (t) => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess("*", "*", "blocked");
+    await SetFirstPartyCookieAndUnsetStorageAccessPermission(cross_site);
+    addCommonCleanupCallback(t);
+
+    await grantStorageAccessForEmbedSite(t, cross_site);
+    await sendReadableHeaderRequest(makeURL(key, cross_site, retry_path,
+                                            [['retry-allowed-origin','*']]));
+    // Retrieve the pre-retry headers.
+    const headers = await sendRetrieveRequest(key);
+    assertHeaderValuesMatch(headers, {
+        'sec-fetch-storage-access': ['inactive'],
+        'origin': [https_origin],
+        'cookie': undefined
+    });
+    // Retrieve the headers for the retried request.
+    const retried_headers = await sendRetrieveRequest(retriedKey(key));
+    assertHeaderValuesMatch(retried_headers, {
+        'sec-fetch-storage-access': ['active'],
+        'origin': [https_origin],
+        'cookie': ['cookie=unpartitioned']
+    });
+}, "Sec-Fetch-Storage-Access is active after retry with wildcard `allowed-origin` value.");
+
+promise_test(async (t) => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess("*", "*", "blocked");
+    addCommonCleanupCallback(t);
+
+    await grantStorageAccessForEmbedSite(t, cross_site);
+    await sendReadableHeaderRequest(
+                            makeURL(key, cross_site, retry_path,
+                                    [['retry-allowed-origin', '']]));
+
+    // The server behavior when retrieving a header that was never sent is
+    // indistinguishable from its behavior when retrieving a header that was
+    // sent but was previously retrieved. To ensure the request to retrieve the
+    // post-retry header occurs only because they were never sent, always
+    // test its retrieval first.
+    const retried_headers = await sendRetrieveRequest(retriedKey(key));
+    assert_equals(retried_headers, undefined);
+    // Retrieve the pre-retry headers.
+    const headers = await sendRetrieveRequest(key);
+    assertHeaderValuesMatch(headers, {'sec-fetch-storage-access': ['inactive']});
+}, "'Activate-Storage-Access: retry' is a no-op on a request without an `allowed-origin` value.");
+
+promise_test(async (t) => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess("*", "*", "blocked");
+    addCommonCleanupCallback(t);
+
+    await grantStorageAccessForEmbedSite(t, cross_site);
+    await sendReadableHeaderRequest(makeURL(key, cross_site, retry_path,
+                                            [['retry-allowed-origin',
+                                              same_site]]));
+    // Should not be able to retrieve any headers at the post-retry key.
+    const retried_headers = await sendRetrieveRequest(retriedKey(key));
+    assert_equals(retried_headers, undefined);
+    // Retrieve the pre-retry headers.
+    const headers = await sendRetrieveRequest(key);
+    assertHeaderValuesMatch(headers, {'sec-fetch-storage-access': ['inactive']});
+}, "'Activate-Storage-Access: retry' is a no-op on a request from an origin that does not match its `allowed-origin` value.");
+
+promise_test(async (t) => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess("*", "*", "blocked");
+    addCommonCleanupCallback(t);
+
+    await sendReadableHeaderRequest(makeURL(key, cross_site, retry_path,
+                                            [['retry-allowed-origin',
+                                              https_origin]]));
+    // Should not be able to retrieve any headers at the post-retry key.
+    const retried_headers = await sendRetrieveRequest(retriedKey(key));
+    assert_equals(retried_headers, undefined);
+    // Retrieve the pre-retry headers.
+    const headers = await sendRetrieveRequest(key);
+    assertHeaderValuesMatch(headers, {'sec-fetch-storage-access': ['none'],
+                                      'origin': undefined});
+}, "Activate-Storage-Access `retry` is a no-op on a request with a `none` Storage Access status.");
+
+promise_test(async (t) => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess("*", "*", "blocked");
+    addCommonCleanupCallback(t);
+
+    await grantStorageAccessForEmbedSite(t, cross_site);
+    const load_header_iframe = await CreateFrame(makeURL(key, cross_site,
+                                       non_retry_path,
+                                       [['load', ''],
+                                        ['script', responder_script]]));
+    assert_true(await FrameHasStorageAccess(load_header_iframe),
+                "frame should have storage access because of the `load` header");
+}, "Activate-Storage-Access `load` header grants storage access to frame.");
+
+promise_test(async (t) => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess("*", "*", "blocked");
+    addCommonCleanupCallback(t);
+
+    const iframe = await CreateFrame(makeURL(key, cross_site,
+                                       non_retry_path,
+                                       [['script', responder_script]]));
+    t.add_cleanup(async () => {
+        SetPermissionInFrame(iframe,
+            [{ name: 'storage-access' }, 'prompt']);
+    });
+    await SetPermissionInFrame(iframe,
+                [{ name: 'storage-access' }, 'granted']);
+    await RequestStorageAccessInFrame(iframe);
+    // Create a child iframe with the same source, that causes the server to
+    // respond with the `load` header.
+    const nested_iframe = await CreateFrameHelper((frame) => {
+        // Need a unique `key` on the request or else the server will fail it.
+        frame.src = makeURL(key + 'load', cross_site, non_retry_path,
+                            [['load', ''], ['script', responder_script]]);
+        iframe.appendChild(frame);
+      }, false);
+    // The nested frame will have storage access because of the `load` response.
+    assert_true(await FrameHasStorageAccess(nested_iframe));
+}, "Activate-Storage-Access `load` is honored for `active` cases.");
+
+promise_test(async (t) => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess("*", "*", "blocked");
+    addCommonCleanupCallback(t);
+
+    const load_header_iframe = await CreateFrame(makeURL(key, cross_site,
+                                       non_retry_path,
+                                       [['load', ''],
+                                        ['script', responder_script]]));
+    assert_false(await FrameHasStorageAccess(load_header_iframe),
+                "frame should not have received storage access.");
+}, "Activate-Storage-Access `load` header is a no-op for requests without storage access.");
+
+promise_test(async t => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess('*', '*', 'blocked');
+    addCommonCleanupCallback(t);
+
+    const iframe_params = new URLSearchParams([['script',
+                                                'embedded_responder.js']]);
+    const iframe = await CreateFrame(cross_site + nested_path + '?' +
+                                     iframe_params.toString());
+
+    // Create a cross-site request within the iframe
+    const nested_url_params = new URLSearchParams([['key', key]]);
+    const nested_url = https_origin + non_retry_path + '?' +
+                       nested_url_params.toString();
+    await NoCorsFetchFromFrame(iframe, nested_url);
+
+    const headers = await sendRetrieveRequest(key);
+    assertHeaderValuesMatch(headers, {'sec-fetch-storage-access': ['inactive'],
+                                      'origin': [cross_site]});
+}, "Sec-Fetch-Storage-Access is `inactive` for ABA case.");
+
+promise_test(async t => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess('*', '*', 'blocked');
+    await SetFirstPartyCookieAndUnsetStorageAccessPermission(https_origin);
+    addCommonCleanupCallback(t);
+
+    const iframe_params = new URLSearchParams([['script',
+                                                'embedded_responder.js']]);
+    const iframe = await CreateFrame(cross_site + nested_path + '?' +
+                                     iframe_params.toString());
+
+    const nested_url_params = new URLSearchParams([
+                                    ['key', key],
+                                    ['retry-allowed-origin', cross_site]]);
+    const nested_url = https_origin + retry_path +
+                       '?' + nested_url_params.toString();
+    await NoCorsFetchFromFrame(iframe, nested_url);
+    const headers = await sendRetrieveRequest(key);
+    assertHeaderValuesMatch(headers, {
+        'sec-fetch-storage-access': ['inactive'],
+        'origin': [cross_site],
+        'cookie': undefined
+    });
+
+    // Storage access should have been activated, without the need for a grant,
+    // on the ABA case.
+    const retried_headers = await sendRetrieveRequest(retriedKey(key));
+    assertHeaderValuesMatch(retried_headers, {
+        'sec-fetch-storage-access': ['active'],
+        'origin': [cross_site],
+        'cookie': ['cookie=unpartitioned']
+    });
+}, "Storage Access can be activated for ABA cases by retrying.");
+
+promise_test(async (t) => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess("*", "*", "blocked");
+    await SetFirstPartyCookieAndUnsetStorageAccessPermission(cross_site);
+    addCommonCleanupCallback(t);
+
+    await grantStorageAccessForEmbedSite(t, cross_site);
+
+    // Create a redirect destination that is same origin to the initial
+    // request.
+    const redirect_url = makeURL(key,
+                                 cross_site,
+                                 retry_path,
+                                 [['redirected', '']]);
+    // Send a request instructing the server include the `retry` response,
+    // and then redirect when storage access has been activated.
+    await sendReadableHeaderRequest(makeURL(key, cross_site, retry_path,
+                                            [['retry-allowed-origin',
+                                                https_origin],
+                                             ['once-active-redirect-location',
+                                                redirect_url]]));
+    // Confirm the normal retry behavior.
+    const headers = await sendRetrieveRequest(key);
+    assertHeaderValuesMatch(headers, {'sec-fetch-storage-access': ['inactive'],
+                                      'origin': [https_origin], 'cookie': undefined});
+    const retried_headers = await sendRetrieveRequest(retriedKey(key));
+    assertHeaderValuesMatch(retried_headers, {
+        'sec-fetch-storage-access': ['active'],
+        'origin': [https_origin],
+        'cookie': ['cookie=unpartitioned']
+    });
+    // Retrieve the headers for the post-retry redirect request.
+    const redirected_headers = await sendRetrieveRequest(redirectedKey(retriedKey(key)));
+    assertHeaderValuesMatch(redirected_headers, {
+        'sec-fetch-storage-access': ['active'],
+        'origin': [https_origin],
+        'cookie': ['cookie=unpartitioned']
+    });
+}, "Sec-Fetch-Storage-Access maintains value on same-origin redirect.");
+
+promise_test(async (t) => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess("*", "*", "blocked");
+    await SetFirstPartyCookieAndUnsetStorageAccessPermission(cross_site);
+    addCommonCleanupCallback(t);
+
+    await grantStorageAccessForEmbedSite(t, cross_site);
+
+    // Create a redirect destination that is cross-origin same-site to the
+    // initial request.
+    const redirect_url = makeURL(key, alt_cross_site, retry_path,
+                                 [['redirected', '']]);
+    await sendReadableHeaderRequest(makeURL(key, cross_site, retry_path,
+                                            [['retry-allowed-origin',
+                                                https_origin],
+                                             ['once-active-redirect-location',
+                                                redirect_url]]));
+
+    const headers = await sendRetrieveRequest(key);
+    assertHeaderValuesMatch(headers, {
+        'sec-fetch-storage-access': ['inactive'],
+        'origin': [https_origin],
+        'cookie': undefined
+    });
+    const retried_headers = await sendRetrieveRequest(retriedKey(key));
+    assertHeaderValuesMatch(retried_headers, {
+        'sec-fetch-storage-access': ['active'],
+        'origin': [https_origin],
+        'cookie': ['cookie=unpartitioned']
+    });
+    // Retrieve the headers for the post-retry redirect request.
+    const redirected_headers = await sendRetrieveRequest(redirectedKey(key));
+    assertHeaderValuesMatch(redirected_headers, {
+        'sec-fetch-storage-access': ['inactive'],
+        'origin': ['null'],
+        'cookie': undefined
+    });
+}, "Sec-Fetch-Storage-Access is not 'active' after cross-origin same-site redirection.");
+
+promise_test(async (t) => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess("*", "*", "blocked");
+    await SetFirstPartyCookieAndUnsetStorageAccessPermission(cross_site);
+    addCommonCleanupCallback(t);
+    await grantStorageAccessForEmbedSite(t, cross_site);
+
+    // Create a redirect destination that is cross-site to the
+    // initial request.
+    const redirect_url = makeURL(key, https_origin, retry_path,
+                                 [['redirected', '']]);
+    await sendReadableHeaderRequest(makeURL(key, cross_site, retry_path,
+                                            [['retry-allowed-origin',
+                                                https_origin],
+                                             ['once-active-redirect-location',
+                                                redirect_url]]));
+
+    const headers = await sendRetrieveRequest(key);
+    assertHeaderValuesMatch(headers, {
+        'sec-fetch-storage-access': ['inactive'],
+        'origin': [https_origin],
+        'cookie': undefined
+    });
+    const retried_headers = await sendRetrieveRequest(retriedKey(key));
+    assertHeaderValuesMatch(retried_headers, {
+        'sec-fetch-storage-access': ['active'],
+        'origin': [https_origin],
+        'cookie': ['cookie=unpartitioned']
+    });
+    // Retrieve the headers for the post-retry redirect request.
+    const redirected_headers = await sendRetrieveRequest(redirectedKey(key));
+    // These values will be empty because the frame is now same origin with
+    // the top level.
+    assertHeaderValuesMatch(redirected_headers, {
+        'sec-fetch-storage-access': undefined,
+        'origin': ['null'],
+        'cookie': undefined
+    });
+}, "Sec-Fetch-Storage-Access loses value on a cross-site redirection.");
+
+promise_test(async (t) => {
+    const key = '{{uuid()}}';
+    await MaybeSetStorageAccess("*", "*", "blocked");
+    await SetFirstPartyCookieAndUnsetStorageAccessPermission(cross_site);
+    addCommonCleanupCallback(t);
+    await grantStorageAccessForEmbedSite(t, cross_site);
+
+    // Create a redirect destination that is cross-origin same-site to the
+    // initial request.
+    const redirect_url = makeURL(key, https_origin, retry_path, [['redirected', '']]);
+     // Send a request that instructs the server to respond with both retry and
+     // response headers.
+    await sendReadableHeaderRequest(makeURL(key, cross_site, retry_path,
+                                            [['retry-allowed-origin',
+                                                https_origin],
+                                             ['redirect-location',
+                                                redirect_url]]));
+    // No redirect should have occurred, so a retrieval request for the
+    // redirect request should fail.
+    const redirected_headers = await sendRetrieveRequest(redirectedKey(key));
+    assert_equals(redirected_headers, undefined);
+    // Confirm the normal retry behavior.
+    const headers = await sendRetrieveRequest(key);
+    assertHeaderValuesMatch(headers, {'sec-fetch-storage-access': ['inactive'],
+                                      'origin': [https_origin],
+                                      'cookie': undefined});
+    const retried_headers = await sendRetrieveRequest(retriedKey(key));
+    assertHeaderValuesMatch(retried_headers, {
+        'sec-fetch-storage-access': ['active'],
+        'origin': [https_origin],
+        'cookie': ['cookie=unpartitioned']
+    });
+}, "Activate-Storage-Access retry is handled before any redirects are followed.");
\ No newline at end of file
diff --git a/tests/wpt/tests/svg/types/SVGElement.ownerSVGElement-01.html b/tests/wpt/tests/svg/types/SVGElement.ownerSVGElement-01.html
new file mode 100644
index 00000000000..8e064adeeb2
--- /dev/null
+++ b/tests/wpt/tests/svg/types/SVGElement.ownerSVGElement-01.html
@@ -0,0 +1,80 @@
+<!DOCTYPE html>
+<title>SVGElement.ownerSVGElement</title>
+<link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
+<link rel="help" href="https://svgwg.org/svg2-draft/types.html#__svg__SVGElement__ownerSVGElement">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<div id="test">
+  <div id="container">
+    <svg id="top-svg">
+      <rect width="10" height="10"></rect>
+      <g>
+        <circle r="10">
+          <title>A circle.</title>
+        </circle>
+        <svg id="inner-svg">
+          <polygon points="1,1 2,2 3,1"></polygon>
+        </svg>
+        <foreignObject>
+          <svg id="svg-in-fo">
+            <svg id="inner-svg-in-fo"></svg>
+          </svg>
+        </foreignObject>
+      </g>
+    </svg>
+  </div>
+</div>
+<script>
+setup(() => {
+  var topSVG = document.querySelector("#top-svg");
+  var innerSVG = document.querySelector("#inner-svg");
+  window.tests = [
+    // [Element or selector used to find element,
+    //  expected ownerSVGElement value,
+    //  description]
+    [topSVG, null, "outer <svg> element"],
+    ["rect", topSVG, "non-<svg> child of outer <svg> element"],
+    ["#top-svg title", topSVG, "non-<svg> descendant of outer <svg> element"],
+    [innerSVG, topSVG, "inner <svg> descendant of outer <svg> element"],
+    ["polygon", innerSVG, "non-<svg> descendant of inner <svg> element"],
+    ["#svg-in-fo", null, "outer <svg> in foreignObject"],
+    ["#inner-svg-in-fo", "#svg-in-fo", "inner <svg> child of outer <svg> in foreignObject"],
+  ];
+
+  // Resolve the selectors to actual elements.
+  tests.forEach(function(t) {
+    for (var i = 0; i < 2; i++) {
+      if (typeof t[i] === "string") {
+        t[i] = document.querySelector(t[i]);
+      }
+    }
+  });
+});
+// First, run all the tests with the elements in the document.
+tests.forEach(function(t) {
+  test(function() {
+    assert_equals(t[0].ownerSVGElement, t[1]);
+  }, t[2] + " (in document)");
+});
+
+// Then remove the elements from the document and test again.
+var container = document.querySelector("#container");
+container.remove();
+tests.forEach(function(t) {
+  test(function() {
+    assert_equals(t[0].ownerSVGElement, t[1]);
+  }, t[2] + " (not in document)");
+});
+
+// Finally a couple of tests for SVG elements with no parent.
+test(function() {
+  var ellipse = document.createElementNS("http://www.w3.org/2000/svg", "ellipse");
+  assert_equals(ellipse.ownerSVGElement, null);
+}, "non-svg element with no parent");
+
+test(function() {
+  var svg = document.createElementNS("http://www.w3.org/2000/svg", "svg");
+  assert_equals(svg.ownerSVGElement, null);
+}, "svg element with no parent");
+</script>
diff --git a/tests/wpt/tests/svg/types/SVGElement.ownerSVGElement-02.html b/tests/wpt/tests/svg/types/SVGElement.ownerSVGElement-02.html
new file mode 100644
index 00000000000..46607034f22
--- /dev/null
+++ b/tests/wpt/tests/svg/types/SVGElement.ownerSVGElement-02.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<title>SVGElement.ownerSVGElement</title>
+<link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
+<link rel="help" href="https://svgwg.org/svg2-draft/types.html#__svg__SVGElement__ownerSVGElement">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+  function run() {
+    var iframe = document.querySelector("iframe");
+    var svg = iframe.contentDocument.documentElement;
+    var rect = svg.firstElementChild;
+
+    test(function() {
+      assert_equals(svg.ownerSVGElement, null);
+    }, "root svg element");
+
+    test(function() {
+      assert_equals(rect.ownerSVGElement, svg);
+    }, "non-svg child of root svg element");
+  }
+  </script>
+<div id="test">
+  <iframe src="helper-SVGElement.ownerSVGElement-02.svg" onload="run()"></iframe>
+</div>
diff --git a/tests/wpt/tests/svg/types/helper-SVGElement.ownerSVGElement-02.svg b/tests/wpt/tests/svg/types/helper-SVGElement.ownerSVGElement-02.svg
new file mode 100644
index 00000000000..2335bb42c51
--- /dev/null
+++ b/tests/wpt/tests/svg/types/helper-SVGElement.ownerSVGElement-02.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+  <rect width="10" height="10"/>
+</svg>
diff --git a/tests/wpt/tests/tools/lint/lint.py b/tests/wpt/tests/tools/lint/lint.py
index 32bc7ece7b1..c1c3b252f91 100644
--- a/tests/wpt/tests/tools/lint/lint.py
+++ b/tests/wpt/tests/tools/lint/lint.py
@@ -475,7 +475,7 @@ def check_parsed(repo_root: Text, path: Text, f: IO[bytes]) -> List[rules.Error]
 
     testdriver_vendor_nodes: List[ElementTree.Element] = []
     if source_file.testdriver_nodes:
-        if test_type != "testharness":
+        if test_type not in {"testharness", "reftest", "print-reftest", "crashtest", "support"}:
             errors.append(rules.TestdriverInUnsupportedType.error(path, (test_type,)))
 
         if len(source_file.testdriver_nodes) > 1:
diff --git a/tests/wpt/tests/tools/lint/tests/test_file_lints.py b/tests/wpt/tests/tools/lint/tests/test_file_lints.py
index e77048b3156..b2b15f68665 100644
--- a/tests/wpt/tests/tools/lint/tests/test_file_lints.py
+++ b/tests/wpt/tests/tools/lint/tests/test_file_lints.py
@@ -350,37 +350,20 @@ def test_multiple_testharnessreport():
 def test_testdriver_in_unsupported():
     code = b"""
 <html xmlns="http://www.w3.org/1999/xhtml">
-<link rel="match" href="test-ref.html"/>
 <script src="/resources/testdriver.js"></script>
 <script src="/resources/testdriver-vendor.js"></script>
 </html>
 """
-    error_map = check_with_files(code)
 
-    for (filename, (errors, kind)) in error_map.items():
-        check_errors(errors)
-
-        if kind in ["web-lax", "web-strict"]:
-            assert errors == [
-                (
-                    "NON-EXISTENT-REF",
-                    "Reference test with a non-existent 'match' relationship reference: "
-                    "'test-ref.html'",
-                    filename,
-                    None,
-                ),
-                (
-                    "TESTDRIVER-IN-UNSUPPORTED-TYPE",
-                    "testdriver.js included in a reftest test, which doesn't support "
-                    "testdriver.js",
-                    filename,
-                    None,
-                ),
-            ]
-        elif kind == "python":
-            assert errors == [
-                ("PARSE-FAILED", "Unable to parse file", filename, 2),
-            ]
+    filename = os.path.join("html", "test-manual.html")
+    errors = check_file_contents("", filename, io.BytesIO(code))
+    check_errors(errors)
+    assert errors == [(
+        "TESTDRIVER-IN-UNSUPPORTED-TYPE",
+        "testdriver.js included in a manual test, which doesn't support testdriver.js",
+        filename,
+        None,
+    )]
 
 
 def test_early_testdriver_vendor():
diff --git a/tests/wpt/tests/tools/manifest/item.py b/tests/wpt/tests/tools/manifest/item.py
index e25f7ca2c29..e1f509bbdab 100644
--- a/tests/wpt/tests/tools/manifest/item.py
+++ b/tests/wpt/tests/tools/manifest/item.py
@@ -166,7 +166,7 @@ class TestharnessTest(URLManifestItem):
         return self._extras.get("pac")
 
     @property
-    def testdriver(self) -> Optional[Text]:
+    def testdriver(self) -> Optional[bool]:
         return self._extras.get("testdriver")
 
     @property
@@ -240,6 +240,10 @@ class RefTest(URLManifestItem):
             rv[key] = v
         return rv
 
+    @property
+    def testdriver(self) -> Optional[bool]:
+        return self._extras.get("testdriver")
+
     def to_json(self) -> Tuple[Optional[Text], List[Tuple[Text, Text]], Dict[Text, Any]]:  # type: ignore
         rel_url = None if self._url == self.path else self._url
         rv: Tuple[Optional[Text], List[Tuple[Text, Text]], Dict[Text, Any]] = (rel_url, self.references, {})
@@ -252,6 +256,8 @@ class RefTest(URLManifestItem):
             extras["dpi"] = self.dpi
         if self.fuzzy:
             extras["fuzzy"] = list(self.fuzzy.items())
+        if self.testdriver:
+            extras["testdriver"] = self.testdriver
         return rv
 
     @classmethod
@@ -315,6 +321,16 @@ class CrashTest(URLManifestItem):
     def timeout(self) -> Optional[Text]:
         return None
 
+    @property
+    def testdriver(self) -> Optional[bool]:
+        return self._extras.get("testdriver")
+
+    def to_json(self):  # type: ignore
+        rel_url, extras = super().to_json()
+        if self.testdriver:
+            extras["testdriver"] = self.testdriver
+        return rel_url, extras
+
 
 class WebDriverSpecTest(URLManifestItem):
     __slots__ = ()
diff --git a/tests/wpt/tests/tools/manifest/sourcefile.py b/tests/wpt/tests/tools/manifest/sourcefile.py
index 02ab1ad4fe6..e5fd0294a54 100644
--- a/tests/wpt/tests/tools/manifest/sourcefile.py
+++ b/tests/wpt/tests/tools/manifest/sourcefile.py
@@ -946,7 +946,8 @@ class SourceFile:
                     self.tests_root,
                     self.rel_path,
                     self.url_base,
-                    self.rel_url
+                    self.rel_url,
+                    testdriver=self.has_testdriver,
                 )]
 
         elif self.name_is_print_reftest:
@@ -965,6 +966,7 @@ class SourceFile:
                     viewport_size=self.viewport_size,
                     fuzzy=self.fuzzy,
                     page_ranges=self.page_ranges,
+                    testdriver=self.has_testdriver,
                 )]
 
         elif self.name_is_multi_global:
@@ -1065,7 +1067,8 @@ class SourceFile:
                     timeout=self.timeout,
                     viewport_size=self.viewport_size,
                     dpi=self.dpi,
-                    fuzzy=self.fuzzy
+                    fuzzy=self.fuzzy,
+                    testdriver=self.has_testdriver,
                 ))
 
         elif self.content_is_css_visual and not self.name_is_reference:
diff --git a/tests/wpt/tests/tools/manifest/tests/test_manifest.py b/tests/wpt/tests/tools/manifest/tests/test_manifest.py
index 7511b21bc83..621b71c091e 100644
--- a/tests/wpt/tests/tools/manifest/tests/test_manifest.py
+++ b/tests/wpt/tests/tools/manifest/tests/test_manifest.py
@@ -335,3 +335,29 @@ def test_manifest_spec_to_json():
             ]}},
         }
     }
+
+
+@pytest.mark.parametrize("testdriver,expected_extra", [
+    (True, {"testdriver": True}),
+    # Don't bloat the manifest with the `testdriver=False` default.
+    (False, {}),
+])
+def test_dump_testdriver(testdriver, expected_extra):
+    m = manifest.Manifest("")
+    source_file = SourceFileWithTest("a" + os.path.sep + "b", "0"*40, item.RefTest,
+                                     testdriver=testdriver)
+
+    tree, sourcefile_mock = tree_and_sourcefile_mocks([(source_file, None, True)])
+    with mock.patch("tools.manifest.manifest.SourceFile", side_effect=sourcefile_mock):
+        assert m.update(tree) is True
+
+    assert m.to_json() == {
+        'version': 9,
+        'url_base': '/',
+        'items': {
+            'reftest': {'a': {'b': [
+                '0000000000000000000000000000000000000000',
+                (mock.ANY, [], expected_extra)
+            ]}},
+        }
+    }
diff --git a/tests/wpt/tests/tools/wpt/virtualenv.py b/tests/wpt/tests/tools/wpt/virtualenv.py
index f1fad732701..46407318cd3 100644
--- a/tests/wpt/tests/tools/wpt/virtualenv.py
+++ b/tests/wpt/tests/tools/wpt/virtualenv.py
@@ -6,7 +6,6 @@ import shutil
 import site
 import sys
 import sysconfig
-from pathlib import Path
 from shutil import which
 
 # The `pkg_resources` module is provided by `setuptools`, which is itself a
@@ -50,11 +49,40 @@ class Virtualenv:
             self._working_set = None
         call(*self.virtualenv, self.path)
 
+    def get_paths(self):
+        """Wrapper around sysconfig.get_paths(), returning the appropriate paths for the env."""
+        if "venv" in sysconfig.get_scheme_names():
+            # This should always be used on Python 3.11 and above.
+            scheme = "venv"
+        elif os.name == "nt":
+            # This matches nt_venv, unless sysconfig has been modified.
+            scheme = "nt"
+        elif os.name == "posix":
+            # This matches posix_venv, unless sysconfig has been modified.
+            scheme = "posix_prefix"
+        elif sys.version_info >= (3, 10):
+            # Using the default scheme is somewhat fragile, as various Python
+            # distributors (e.g., what Debian and Fedora package, and what Xcode
+            # includes) change the default scheme away from the upstream
+            # defaults, but it's about as good as we can do.
+            scheme = sysconfig.get_default_scheme()
+        else:
+            # This is explicitly documented as having previously existed in the 3.10
+            # docs, and has existed since CPython 2.7 and 3.1 (but not 3.0).
+            scheme = sysconfig._get_default_scheme()
+
+        vars = {
+            "base": self.path,
+            "platbase": self.path,
+            "installed_base": self.path,
+            "installed_platbase": self.path,
+        }
+
+        return sysconfig.get_paths(scheme, vars)
+
     @property
     def bin_path(self):
-        if sys.platform in ("win32", "cygwin"):
-            return os.path.join(self.path, "Scripts")
-        return os.path.join(self.path, "bin")
+        return self.get_paths()["scripts"]
 
     @property
     def pip_path(self):
@@ -67,24 +95,10 @@ class Virtualenv:
 
     @property
     def lib_path(self):
-        base = self.path
-
-        # this block is literally taken from virtualenv 16.4.3
-        IS_PYPY = hasattr(sys, "pypy_version_info")
-        IS_JYTHON = sys.platform.startswith("java")
-        if IS_JYTHON:
-            site_packages = os.path.join(base, "Lib", "site-packages")
-        elif IS_PYPY:
-            site_packages = os.path.join(base, "site-packages")
-        else:
-            IS_WIN = sys.platform == "win32"
-            if IS_WIN:
-                site_packages = os.path.join(base, "Lib", "site-packages")
-            else:
-                version = f"{sys.version_info.major}.{sys.version_info.minor}"
-                site_packages = os.path.join(base, "lib", f"python{version}", "site-packages")
-
-        return site_packages
+        # We always return platlib here, even if it differs to purelib, because we can
+        # always install pure-Python code into the platlib safely too. It's also very
+        # unlikely to differ for a venv.
+        return self.get_paths()["platlib"]
 
     @property
     def working_set(self):
@@ -97,43 +111,35 @@ class Virtualenv:
         return self._working_set
 
     def activate(self):
-        if sys.platform == 'darwin':
+        if sys.platform == "darwin":
             # The default Python on macOS sets a __PYVENV_LAUNCHER__ environment
             # variable which affects invocation of python (e.g. via pip) in a
             # virtualenv. Unset it if present to avoid this. More background:
             # https://github.com/web-platform-tests/wpt/issues/27377
             # https://github.com/python/cpython/pull/9516
-            os.environ.pop('__PYVENV_LAUNCHER__', None)
+            os.environ.pop("__PYVENV_LAUNCHER__", None)
+
+        paths = self.get_paths()
 
         # Setup the path and site packages as if we'd launched with the virtualenv active
-        bin_dir = os.path.join(self.path, "bin")
+        bin_dir = paths["scripts"]
         os.environ["PATH"] = os.pathsep.join([bin_dir] + os.environ.get("PATH", "").split(os.pathsep))
+
+        # While not required (`./venv/bin/python3` won't set it, but
+        # `source ./venv/bin/activate && python3` will), we have historically set this.
         os.environ["VIRTUAL_ENV"] = self.path
 
         prev_length = len(sys.path)
 
-        schemes = sysconfig.get_scheme_names()
-        if "venv" in schemes:
-            scheme = "venv"
-        else:
-            scheme = "nt" if os.name == "nt" else "posix_user"
-        sys_paths = sysconfig.get_paths(scheme)
-        data_path = sys_paths["data"]
-        added = set()
         # Add the venv library paths as sitedirs.
-        # This converts system paths like /usr/local/lib/python3.10/site-packages
-        # to venv-relative paths like {self.path}/lib/python3.10/site-packages and adds
-        # those paths as site dirs to be used for module import.
         for key in ["purelib", "platlib"]:
-            host_path = Path(sys_paths[key])
-            relative_path = host_path.relative_to(data_path)
-            site_dir = os.path.normpath(os.path.normcase(Path(self.path) / relative_path))
-            if site_dir not in added:
-                site.addsitedir(site_dir)
-                added.add(site_dir)
+            site.addsitedir(paths[key])
+
+        # Rearrange the path
         sys.path[:] = sys.path[prev_length:] + sys.path[0:prev_length]
 
-        sys.real_prefix = sys.prefix
+        # Change prefixes, similar to what initconfig/site does for venvs.
+        sys.exec_prefix = self.path
         sys.prefix = self.path
 
     def start(self):
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/headless_shell.py b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/headless_shell.py
index 7fd11fecbe0..c20d4011eeb 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/headless_shell.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/browsers/headless_shell.py
@@ -2,7 +2,8 @@
 
 from .base import require_arg
 from .base import get_timeout_multiplier   # noqa: F401
-from .chrome import ChromeBrowser, debug_args, executor_kwargs  # noqa: F401
+from .chrome import ChromeBrowser, debug_args  # noqa: F401
+from .chrome import executor_kwargs as chrome_executor_kwargs
 from ..executors.base import WdspecExecutor  # noqa: F401
 from ..executors.executorchrome import (  # noqa: F401
     ChromeDriverCrashTestExecutor,
@@ -41,6 +42,17 @@ def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
             "debug_info": kwargs["debug_info"]}
 
 
+def executor_kwargs(logger, test_type, test_environment, run_info_data, subsuite,
+                    **kwargs):
+    executor_kwargs = chrome_executor_kwargs(logger, test_type, test_environment, run_info_data,
+                                             subsuite, **kwargs)
+    chrome_options = executor_kwargs["capabilities"]["goog:chromeOptions"]
+    # Defaultly enable SiteIsolation in headless shell
+    if "--disable-site-isolation-trials" not in chrome_options["args"]:
+        chrome_options["args"].append("--site-per-process")
+    return executor_kwargs
+
+
 def env_extras(**kwargs):
     return []
 
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/environment.py b/tests/wpt/tests/tools/wptrunner/wptrunner/environment.py
index 071ff6df716..9a6d3c8fb60 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/environment.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/environment.py
@@ -23,8 +23,6 @@ repo_root = os.path.abspath(os.path.join(here, os.pardir, os.pardir, os.pardir))
 sys.path.insert(0, repo_root)
 from tools import localpaths  # noqa: F401
 
-from wptserve.handlers import StringHandler
-
 serve = None
 
 
@@ -226,29 +224,47 @@ class TestEnvironment:
             self.config.aliases,
             self.config)
 
+        testharnessreport_format_args = {
+            "output": self.pause_after_test,
+            "timeout_multiplier": self.testharness_timeout_multipler,
+            "explicit_timeout": "true" if self.debug_info is not None else "false",
+            "debug": "true" if self.debug_test else "false",
+        }
         for path, format_args, content_type, route in [
                 ("testharness_runner.html", {}, "text/html", "/testharness_runner.html"),
                 ("print_pdf_runner.html", {}, "text/html", "/print_pdf_runner.html"),
-                (os.path.join(here, "..", "..", "third_party", "pdf_js", "pdf.js"), None,
+                (os.path.join(here, "..", "..", "third_party", "pdf_js", "pdf.js"), {},
                  "text/javascript", "/_pdf_js/pdf.js"),
-                (os.path.join(here, "..", "..", "third_party", "pdf_js", "pdf.worker.js"), None,
+                (os.path.join(here, "..", "..", "third_party", "pdf_js", "pdf.worker.js"), {},
                  "text/javascript", "/_pdf_js/pdf.worker.js"),
-                (self.options.get("testharnessreport", "testharnessreport.js"),
-                 {"output": self.pause_after_test,
-                  "timeout_multiplier": self.testharness_timeout_multipler,
-                  "explicit_timeout": "true" if self.debug_info is not None else "false",
-                  "debug": "true" if self.debug_test else "false"},
-                 "text/javascript;charset=utf8",
-                 "/resources/testharnessreport.js")]:
-            path = os.path.normpath(os.path.join(here, path))
+                (
+                    self.options.get("testharnessreport", [
+                        # All testharness tests, even those that don't use testdriver, require
+                        # `message-queue.js` to signal completion.
+                        os.path.join("executors", "message-queue.js"),
+                        "testharnessreport.js"]),
+                    testharnessreport_format_args,
+                    "text/javascript;charset=utf8",
+                    "/resources/testharnessreport.js",
+                ),
+                (
+                    [os.path.join(repo_root, "resources", "testdriver.js"),
+                     # Include `message-queue.js` to support testdriver in non-testharness tests.
+                     os.path.join("executors", "message-queue.js"),
+                     "testdriver-extra.js"],
+                    {},
+                    "text/javascript",
+                    "/resources/testdriver.js",
+                ),
+        ]:
+            paths = [path] if isinstance(path, str) else path
+            abs_paths = [os.path.normpath(os.path.join(here, path)) for path in paths]
             # Note that .headers. files don't apply to static routes, so we need to
             # readd any static headers here.
             headers = {"Cache-Control": "max-age=3600"}
-            route_builder.add_static(path, format_args, content_type, route,
+            route_builder.add_static(abs_paths, format_args, content_type, route,
                                      headers=headers)
 
-        route_builder.add_handler("GET", "/resources/testdriver.js", TestdriverLoader())
-
         for url_base, test_root in self.test_paths.items():
             if url_base == "/":
                 continue
@@ -316,27 +332,6 @@ class TestEnvironment:
         return failed, pending
 
 
-class TestdriverLoader:
-    """A special static handler for serving `/resources/testdriver.js`.
-
-    This handler lazily reads `testdriver{,-extra}.js` so that wptrunner doesn't
-    need to pass the entire file contents to child `wptserve` processes, which
-    can slow `wptserve` startup by several seconds (crbug.com/1479850).
-    """
-    def __init__(self):
-        self._handler = None
-
-    def __call__(self, request, response):
-        if not self._handler:
-            data = b""
-            with open(os.path.join(repo_root, "resources", "testdriver.js"), "rb") as fp:
-                data += fp.read()
-            with open(os.path.join(here, "testdriver-extra.js"), "rb") as fp:
-                data += fp.read()
-            self._handler = StringHandler(data, "text/javascript")
-        return self._handler(request, response)
-
-
 def wait_for_service(logger: StructuredLogger,
                      host: str,
                      port: int,
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py
index 9534eaea171..8f9d45d6f6f 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorchrome.py
@@ -111,10 +111,10 @@ class ChromeDriverTestDriverProtocolPart(WebDriverTestDriverProtocolPart):
         else:
             self.webdriver.execute_script(message_script)
 
-    def _get_next_message_classic(self, url):
+    def _get_next_message_classic(self, url, script_resume):
         try:
             message_script, self._pending_message = self._pending_message, ""
-            return self.parent.base.execute_script(message_script + self.script_resume,
+            return self.parent.base.execute_script(message_script + script_resume,
                                                    asynchronous=True,
                                                    args=[strip_server(url)])
         except error.JavascriptErrorException as js_error:
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
index ed145823e2b..7513887998d 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/executorwebdriver.py
@@ -77,7 +77,11 @@ class WebDriverBaseProtocolPart(BaseProtocolPart):
     def set_timeout(self, timeout):
         self.webdriver.timeouts.script = timeout
 
-    def create_window(self, type="tab", **kwargs):
+    def create_window(self, type=None, **kwargs):
+        # WebKitGTK-based browsers have issues when the test is opened in a new tab instead of a separate window
+        # See: https://github.com/web-platform-tests/wpt/issues/49262 and https://webkit.org/b/283392
+        if type is None:
+            type = 'window' if 'webkitgtk:browserOptions' in self.parent.capabilities else 'tab'
         return self.webdriver.new_window(type_hint=type)
 
     @property
@@ -433,24 +437,22 @@ class WebDriverActionSequenceProtocolPart(ActionSequenceProtocolPart):
 class WebDriverTestDriverProtocolPart(TestDriverProtocolPart):
     def setup(self):
         self.webdriver = self.parent.webdriver
-        with open(os.path.join(here, "testharness_webdriver_resume.js")) as f:
-            self.script_resume = f.read()
 
-    def get_next_message(self, url, test_window):
+    def get_next_message(self, url, script_resume, test_window):
         if hasattr(self.parent, "bidi_script"):
             # If `bidi_script` is available, the messages can be handled via BiDi.
-            return self._get_next_message_bidi(url, test_window)
+            return self._get_next_message_bidi(url, script_resume, test_window)
         else:
-            return self._get_next_message_classic(url)
+            return self._get_next_message_classic(url, script_resume)
 
-    def _get_next_message_classic(self, url):
+    def _get_next_message_classic(self, url, script_resume):
         """
         Get the next message from the test_driver using the classic WebDriver async script execution. This will block
         the event loop until the test_driver send a message.
         """
-        return self.parent.base.execute_script(self.script_resume, asynchronous=True, args=[strip_server(url)])
+        return self.parent.base.execute_script(script_resume, asynchronous=True, args=[strip_server(url)])
 
-    def _get_next_message_bidi(self, url, test_window):
+    def _get_next_message_bidi(self, url, script_resume, test_window):
         """
         Get the next message from the test_driver using async call. This will not block the event loop, which allows for
         processing the events from the test_runner to test_driver while waiting for the next test_driver commands.
@@ -466,7 +468,7 @@ class WebDriverTestDriverProtocolPart(TestDriverProtocolPart):
                                 %s
                             }).apply(null, args);
                         })
-                    }""" % self.script_resume
+                    }""" % script_resume
 
         bidi_url_argument = {
             "type": "string",
@@ -833,64 +835,19 @@ class WebDriverRun(TimedRunner):
             self.result_flag.set()
 
 
-class WebDriverTestharnessExecutor(TestharnessExecutor):
-    supports_testdriver = True
-    protocol_cls = WebDriverProtocol
-
-    def __init__(self, logger, browser, server_config, timeout_multiplier=1,
-                 close_after_done=True, capabilities=None, debug_info=None,
-                 cleanup_after_test=True, **kwargs):
-        """WebDriver-based executor for testharness.js tests"""
-        TestharnessExecutor.__init__(self, logger, browser, server_config,
-                                     timeout_multiplier=timeout_multiplier,
-                                     debug_info=debug_info)
-        self.protocol = self.protocol_cls(self, browser, capabilities)
-        with open(os.path.join(here, "window-loaded.js")) as f:
-            self.window_loaded_script = f.read()
-
-
-        self.close_after_done = close_after_done
-        self.cleanup_after_test = cleanup_after_test
-
-    def is_alive(self):
-        return self.protocol.is_alive()
-
-    def on_environment_change(self, new_environment):
-        if new_environment["protocol"] != self.last_environment["protocol"]:
-            self.protocol.testharness.load_runner(new_environment["protocol"])
-
-    def do_test(self, test):
-        url = self.test_url(test)
-
-        success, data = WebDriverRun(self.logger,
-                                     self.do_testharness,
-                                     self.protocol,
-                                     url,
-                                     test.timeout * self.timeout_multiplier,
-                                     self.extra_timeout).run()
-
-        if success:
-            data, extra = data
-            return self.convert_result(test, data, extra=extra)
-
-        return (test.make_result(*data), [])
-
-    def do_testharness(self, protocol, url, timeout):
-        # The previous test may not have closed its old windows (if something
-        # went wrong or if cleanup_after_test was False), so clean up here.
-        protocol.testharness.close_old_windows()
+# TODO(web-platform-tests/wpt#13183): Add testdriver support to the other
+# executors.
+class TestDriverExecutorMixin:
+    def __init__(self, script_resume: str):
+        self.script_resume = script_resume
 
+    def run_testdriver(self, protocol, url, timeout):
         # If protocol implements `bidi_events`, remove all the existing subscriptions.
         if hasattr(protocol, 'bidi_events'):
             # Use protocol loop to run the async cleanup.
             protocol.loop.run_until_complete(protocol.bidi_events.unsubscribe_all())
 
-        # Now start the test harness
         test_window = self.get_or_create_test_window(protocol)
-        self.protocol.base.set_window(test_window)
-        # Wait until about:blank has been loaded
-        protocol.base.execute_script(self.window_loaded_script, asynchronous=True)
-
         # Exceptions occurred outside the main loop.
         unexpected_exceptions = []
 
@@ -944,7 +901,8 @@ class WebDriverTestharnessExecutor(TestharnessExecutor):
                 # TODO: what to do if there are more then 1 unexpected exceptions?
                 raise unexpected_exceptions[0]
 
-            test_driver_message = protocol.testdriver.get_next_message(url, test_window)
+            test_driver_message = protocol.testdriver.get_next_message(url, self.script_resume,
+                                                                       test_window)
             self.logger.debug("Receive message from testdriver: %s" % test_driver_message)
 
             # As of 2019-03-29, WebDriver does not define expected behavior for
@@ -977,41 +935,106 @@ class WebDriverTestharnessExecutor(TestharnessExecutor):
             # Use protocol loop to run the async cleanup.
             protocol.loop.run_until_complete(protocol.bidi_events.unsubscribe_all())
 
-        extra = {}
-        if leak_part := getattr(protocol, "leak", None):
-            testharness_window = protocol.base.current_window
-            extra_windows = set(protocol.base.window_handles())
-            extra_windows -= {protocol.testharness.runner_handle, testharness_window}
-            protocol.testharness.close_windows(extra_windows)
-            try:
-                protocol.base.set_window(testharness_window)
-                if counters := leak_part.check():
-                    extra["leak_counters"] = counters
-            except webdriver_error.NoSuchWindowException:
-                pass
-            finally:
-                protocol.base.set_window(protocol.testharness.runner_handle)
-
-        # Attempt to clean up any leftover windows, if allowed. This is
-        # preferable as it will blame the correct test if something goes wrong
-        # closing windows, but if the user wants to see the test results we
-        # have to leave the window(s) open.
-        if self.cleanup_after_test:
-            protocol.testharness.close_old_windows()
-
         if len(unexpected_exceptions) > 0:
             # TODO: what to do if there are more then 1 unexpected exceptions?
             raise unexpected_exceptions[0]
 
-        return rv, extra
+        return rv
 
     def get_or_create_test_window(self, protocol):
-        return protocol.base.create_window()
+        return protocol.base.current_window
 
 
-class WebDriverRefTestExecutor(RefTestExecutor):
+class WebDriverTestharnessExecutor(TestharnessExecutor, TestDriverExecutorMixin):
+    supports_testdriver = True
     protocol_cls = WebDriverProtocol
 
+    def __init__(self, logger, browser, server_config, timeout_multiplier=1,
+                 close_after_done=True, capabilities=None, debug_info=None,
+                 cleanup_after_test=True, **kwargs):
+        """WebDriver-based executor for testharness.js tests"""
+        TestharnessExecutor.__init__(self, logger, browser, server_config,
+                                     timeout_multiplier=timeout_multiplier,
+                                     debug_info=debug_info)
+        self.protocol = self.protocol_cls(self, browser, capabilities)
+        with open(os.path.join(here, "testharness_webdriver_resume.js")) as f:
+            script_resume = f.read()
+        TestDriverExecutorMixin.__init__(self, script_resume)
+        with open(os.path.join(here, "window-loaded.js")) as f:
+            self.window_loaded_script = f.read()
+
+        self.close_after_done = close_after_done
+        self.cleanup_after_test = cleanup_after_test
+
+    def is_alive(self):
+        return self.protocol.is_alive()
+
+    def on_environment_change(self, new_environment):
+        if new_environment["protocol"] != self.last_environment["protocol"]:
+            self.protocol.testharness.load_runner(new_environment["protocol"])
+
+    def do_test(self, test):
+        url = self.test_url(test)
+
+        success, data = WebDriverRun(self.logger,
+                                     self.do_testharness,
+                                     self.protocol,
+                                     url,
+                                     test.timeout * self.timeout_multiplier,
+                                     self.extra_timeout).run()
+
+        if success:
+            data, extra = data
+            return self.convert_result(test, data, extra=extra)
+
+        return (test.make_result(*data), [])
+
+    def do_testharness(self, protocol, url, timeout):
+        try:
+            # The previous test may not have closed its old windows (if something
+            # went wrong or if cleanup_after_test was False), so clean up here.
+            protocol.testharness.close_old_windows()
+            raw_results = self.run_testdriver(protocol, url, timeout)
+            extra = {}
+            if counters := self._check_for_leaks(protocol):
+                extra["leak_counters"] = counters
+            return raw_results, extra
+        finally:
+            # Attempt to clean up any leftover windows, if allowed. This is
+            # preferable as it will blame the correct test if something goes
+            # wrong closing windows, but if the user wants to see the test
+            # results we have to leave the window(s) open.
+            if self.cleanup_after_test:
+                protocol.testharness.close_old_windows()
+
+    def _check_for_leaks(self, protocol):
+        leak_part = getattr(protocol, "leak", None)
+        if not leak_part:
+            return None
+        testharness_window = protocol.base.current_window
+        extra_windows = set(protocol.base.window_handles())
+        extra_windows -= {protocol.testharness.runner_handle, testharness_window}
+        protocol.testharness.close_windows(extra_windows)
+        try:
+            protocol.base.set_window(testharness_window)
+            return leak_part.check()
+        except webdriver_error.NoSuchWindowException:
+            return None
+        finally:
+            protocol.base.set_window(protocol.testharness.runner_handle)
+
+    def get_or_create_test_window(self, protocol):
+        test_window = protocol.base.create_window()
+        protocol.base.set_window(test_window)
+        # Wait until about:blank has been loaded
+        protocol.base.execute_script(self.window_loaded_script, asynchronous=True)
+        return test_window
+
+
+class WebDriverRefTestExecutor(RefTestExecutor, TestDriverExecutorMixin):
+    protocol_cls = WebDriverProtocol
+    supports_testdriver = True
+
     def __init__(self, logger, browser, server_config, timeout_multiplier=1,
                  screenshot_cache=None, close_after_done=True,
                  debug_info=None, capabilities=None, debug_test=False,
@@ -1034,7 +1057,8 @@ class WebDriverRefTestExecutor(RefTestExecutor):
         self.debug_test = debug_test
 
         with open(os.path.join(here, "test-wait.js")) as f:
-            self.wait_script = f.read() % {"classname": "reftest-wait"}
+            wait_script = f.read() % {"classname": "reftest-wait"}
+        TestDriverExecutorMixin.__init__(self, wait_script)
 
     def reset(self):
         self.implementation.reset()
@@ -1080,8 +1104,9 @@ class WebDriverRefTestExecutor(RefTestExecutor):
                             self.extra_timeout).run()
 
     def _screenshot(self, protocol, url, timeout):
-        self.protocol.base.load(url)
-        self.protocol.base.execute_script(self.wait_script, True)
+        # There's nothing we want from the "complete" message, so discard the
+        # return value.
+        self.run_testdriver(protocol, url, timeout)
 
         screenshot = self.protocol.webdriver.screenshot()
         if screenshot is None:
@@ -1126,8 +1151,9 @@ class WebDriverPrintRefTestExecutor(WebDriverRefTestExecutor):
                             self.extra_timeout).run()
 
     def _render(self, protocol, url, timeout):
-        protocol.webdriver.url = url
-        protocol.base.execute_script(self.wait_script, asynchronous=True)
+        # There's nothing we want from the "complete" message, so discard the
+        # return value.
+        self.run_testdriver(protocol, url, timeout)
 
         pdf = protocol.pdf_print.render_as_pdf(*self.viewport_size)
         screenshots = protocol.pdf_print.pdf_to_png(pdf, self.page_ranges)
@@ -1139,8 +1165,9 @@ class WebDriverPrintRefTestExecutor(WebDriverRefTestExecutor):
         return screenshots
 
 
-class WebDriverCrashtestExecutor(CrashtestExecutor):
+class WebDriverCrashtestExecutor(CrashtestExecutor, TestDriverExecutorMixin):
     protocol_cls = WebDriverProtocol
+    supports_testdriver = True
 
     def __init__(self, logger, browser, server_config, timeout_multiplier=1,
                  screenshot_cache=None, close_after_done=True,
@@ -1158,7 +1185,8 @@ class WebDriverCrashtestExecutor(CrashtestExecutor):
                                           capabilities=capabilities)
 
         with open(os.path.join(here, "test-wait.js")) as f:
-            self.wait_script = f.read() % {"classname": "test-wait"}
+            wait_script = f.read() % {"classname": "test-wait"}
+        TestDriverExecutorMixin.__init__(self, wait_script)
 
     def do_test(self, test):
         timeout = (test.timeout * self.timeout_multiplier if self.debug_info is None
@@ -1177,8 +1205,9 @@ class WebDriverCrashtestExecutor(CrashtestExecutor):
         return (test.make_result(*data), [])
 
     def do_crashtest(self, protocol, url, timeout):
-        protocol.base.load(url)
-        protocol.base.execute_script(self.wait_script, asynchronous=True)
+        # There's nothing we want from the "complete" message, so discard the
+        # return value.
+        self.run_testdriver(protocol, url, timeout)
         result = {"status": "PASS", "message": None}
         if (leak_part := getattr(protocol, "leak", None)) and (counters := leak_part.check()):
             result["extra"] = {"leak_counters": counters}
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/message-queue.js b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/message-queue.js
new file mode 100644
index 00000000000..c79b96aee29
--- /dev/null
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/message-queue.js
@@ -0,0 +1,81 @@
+(function() {
+  if (window.__wptrunner_message_queue && window.__wptrunner_process_next_event) {
+    // Another script already set up the testdriver infrastructure.
+    return;
+  }
+
+  class MessageQueue {
+    constructor() {
+      this.item_id = 0;
+      this._queue = [];
+    }
+
+    push(item) {
+      let cmd_id = this.item_id++;
+      item.id = cmd_id;
+      this._queue.push(item);
+      __wptrunner_process_next_event();
+      return cmd_id;
+    }
+
+    shift() {
+      return this._queue.shift();
+    }
+  }
+
+  window.__wptrunner_testdriver_callback = null;
+  window.__wptrunner_message_queue = new MessageQueue();
+  window.__wptrunner_url = null;
+
+  window.__wptrunner_process_next_event = function() {
+    /* This function handles the next testdriver event. The presence of
+       window.testdriver_callback is used as a switch; when that function
+       is present we are able to handle the next event and when is is not
+       present we must wait. Therefore to drive the event processing, this
+       function must be called in two circumstances:
+         * Every time there is a new event that we may be able to handle
+         * Every time we set the callback function
+       This function unsets the callback, so no further testdriver actions
+       will be run until it is reset, which wptrunner does after it has
+       completed handling the current action.
+     */
+
+    if (!window.__wptrunner_testdriver_callback) {
+      return;
+    }
+    var data = window.__wptrunner_message_queue.shift();
+    if (!data) {
+      return;
+    }
+
+    var payload = undefined;
+
+    switch(data.type) {
+    case "complete":
+      var tests = data.tests;
+      var status = data.status;
+      if (tests && status) {
+        var subtest_results = tests.map(function(x) {
+          return [x.name, x.status, x.message, x.stack];
+        });
+        payload = [status.status,
+                   status.message,
+                   status.stack,
+                   subtest_results];
+        clearTimeout(window.__wptrunner_timer);
+      } else {
+        // Non-testharness test.
+        payload = [];
+      }
+      break;
+    case "action":
+      payload = data;
+      break;
+    default:
+      return;
+    }
+    var callback = window.__wptrunner_testdriver_callback;
+    window.__wptrunner_testdriver_callback = null;
+    callback([__wptrunner_url, data.type, payload]);
+  };
+})();
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/test-wait.js b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/test-wait.js
index ad08ad7d76f..fca6f8df3b8 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/executors/test-wait.js
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/executors/test-wait.js
@@ -1,4 +1,6 @@
-var callback = arguments[arguments.length - 1];
+const initialized = !!window.__wptrunner_url;
+window.__wptrunner_testdriver_callback = arguments[arguments.length - 1];
+window.__wptrunner_url = arguments.length > 1 ? arguments[0] : location.href;
 var observer = null;
 var root = document.documentElement;
 
@@ -13,7 +15,6 @@ function wait_load() {
   }
 }
 
-
 function wait_paints() {
   // As of 2017-04-05, the Chromium web browser exhibits a rendering bug
   // (https://bugs.chromium.org/p/chromium/issues/detail?id=708757) that
@@ -32,24 +33,36 @@ function wait_paints() {
 }
 
 function screenshot_if_ready() {
-  if (root &&
-      root.classList.contains("%(classname)s") &&
-      observer === null) {
-    observer = new MutationObserver(wait_paints);
-    observer.observe(root, {attributes: true});
-    var event = new Event("TestRendered", {bubbles: true});
-    root.dispatchEvent(event);
+  if (root && root.classList.contains("%(classname)s")) {
+    if (observer === null) {
+      observer = new MutationObserver(wait_paints);
+      observer.observe(root, {attributes: true});
+      var event = new Event("TestRendered", {bubbles: true});
+      root.dispatchEvent(event);
+    }
     return;
   }
   if (observer !== null) {
     observer.disconnect();
   }
-  callback();
+  if (window.__wptrunner_message_queue) {
+    __wptrunner_message_queue.push({type: "complete"});
+  } else {
+    // Not using `testdriver.js`, so manually post a raw completion message
+    // that the executor understands.
+    __wptrunner_testdriver_callback([__wptrunner_url, "complete", []]);
+  }
 }
 
-
-if (document.readyState != "complete") {
-  addEventListener('load', wait_load);
-} else {
-  wait_load();
+// The `initialized` flag ensures only up to one `load` handler or
+// `MutationObserver` is ever registered.
+if (!initialized) {
+  if (document.readyState != "complete") {
+    addEventListener('load', wait_load, { once: true });
+  } else {
+    wait_load();
+  }
+}
+if (window.__wptrunner_process_next_event) {
+  window.__wptrunner_process_next_event();
 }
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js b/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js
index c4a02ef40a7..2dd9a70c829 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/testdriver-extra.js
@@ -58,8 +58,17 @@
         event.stopImmediatePropagation();
     });
 
+    const root_classes = document.documentElement.classList;
+    // For non-testharness tests, the presence of `(ref)test-wait` indicates
+    // it's the "main" browsing context through which testdriver actions are
+    // routed. Evaluate this eagerly before the test starts and removes these
+    // classes.
+    if (root_classes.contains("reftest-wait") || root_classes.contains("test-wait")) {
+      window.__wptrunner_is_test_context = true;
+    }
+
     function is_test_context() {
-      return window.__wptrunner_message_queue !== undefined;
+      return !!window.__wptrunner_is_test_context;
     }
 
     // Code copied from /common/utils.js
@@ -242,7 +251,7 @@
     };
 
     window.test_driver_internal.set_test_context = function(context) {
-        if (window.__wptrunner_message_queue) {
+        if (is_test_context()) {
             throw new Error("Tried to set testharness context in a window containing testharness.js");
         }
         testharness_context = context;
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/testharnessreport.js b/tests/wpt/tests/tools/wptrunner/wptrunner/testharnessreport.js
index d385692445c..fb9e8c678de 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/testharnessreport.js
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/testharnessreport.js
@@ -1,75 +1,9 @@
-class MessageQueue {
-  constructor() {
-    this.item_id = 0;
-    this._queue = [];
-  }
-
-  push(item) {
-    let cmd_id = this.item_id++;
-    item.id = cmd_id;
-    this._queue.push(item);
-    __wptrunner_process_next_event();
-    return cmd_id;
-  }
-
-  shift() {
-    return this._queue.shift();
-  }
-}
-
-window.__wptrunner_testdriver_callback = null;
-window.__wptrunner_message_queue = new MessageQueue();
-window.__wptrunner_url = null;
-
-window.__wptrunner_process_next_event = function() {
-  /* This function handles the next testdriver event. The presence of
-     window.testdriver_callback is used as a switch; when that function
-     is present we are able to handle the next event and when is is not
-     present we must wait. Therefore to drive the event processing, this
-     function must be called in two circumstances:
-       * Every time there is a new event that we may be able to handle
-       * Every time we set the callback function
-     This function unsets the callback, so no further testdriver actions
-     will be run until it is reset, which wptrunner does after it has
-     completed handling the current action.
-   */
-
-  if (!window.__wptrunner_testdriver_callback) {
-    return;
-  }
-  var data = window.__wptrunner_message_queue.shift();
-  if (!data) {
-    return;
-  }
-
-  var payload = undefined;
-
-  switch(data.type) {
-  case "complete":
-    var tests = data.tests;
-    var status = data.status;
-
-    var subtest_results = tests.map(function(x) {
-      return [x.name, x.status, x.message, x.stack];
-    });
-    payload = [status.status,
-               status.message,
-               status.stack,
-               subtest_results];
-    clearTimeout(window.__wptrunner_timer);
-    break;
-  case "action":
-    payload = data;
-    break;
-  default:
-    return;
-  }
-  var callback = window.__wptrunner_testdriver_callback;
-  window.__wptrunner_testdriver_callback = null;
-  callback([__wptrunner_url, data.type, payload]);
-};
-
 (function() {
+  // Signal to `testdriver.js` that this is the "main" test browsing context,
+  // meaning testdriver actions should be queued for retrieval instead of
+  // `postMessage()`d elsewhere.
+  window.__wptrunner_is_test_context = true;
+
   var props = {output: %(output)d,
                timeout_multiplier: %(timeout_multiplier)s,
                explicit_timeout: %(explicit_timeout)s,
@@ -85,4 +19,3 @@ window.__wptrunner_process_next_event = function() {
   });
   setup(props);
 })();
-
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/testloader.py b/tests/wpt/tests/tools/wptrunner/wptrunner/testloader.py
index 5969f4ed60e..b5747772050 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/testloader.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/testloader.py
@@ -168,7 +168,7 @@ class Subsuite:
                                                            str(self.run_info))
 
 
-def read_include_from_file(file):
+def read_test_prefixes_from_file(file):
     new_include = []
     with open(file) as f:
         for line in f:
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_testloader.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_testloader.py
index 4555fb79661..66af4cbb26d 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_testloader.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_testloader.py
@@ -15,7 +15,7 @@ from ..testloader import (
     TestFilter,
     TestLoader,
     TagFilter,
-    read_include_from_file,
+    read_test_prefixes_from_file,
 )
 from .test_wpttest import make_mock_manifest
 
@@ -113,7 +113,7 @@ def test_include_file():
         f.write(test_cases)
         f.flush()
 
-        include = read_include_from_file(f.name)
+        include = read_test_prefixes_from_file(f.name)
 
         assert len(include) == 4
         assert "/foo/bar-error.https.html" in include
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_wptrunner.py b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_wptrunner.py
index 4e0e7abc937..cea376e9267 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_wptrunner.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/tests/test_wptrunner.py
@@ -1,7 +1,19 @@
-from ..wptrunner import get_pause_after_test
+# mypy: allow-untyped-calls
+
+from pathlib import Path
+from typing import List, Optional, Tuple
+from unittest.mock import Mock
+
+from ..testloader import TestQueueBuilder
+from ..wptcommandline import TestRoot
+from ..wptrunner import get_loader, get_pause_after_test
 from .test_testloader import Subsuite, TestFilter, TestLoader, WPTManifest
 
-def test_get_pause_after_test():  # type: ignore
+TestQueueBuilder.__test__ = None  # type: ignore[attr-defined]
+TestRoot.__test__ = None  # type: ignore[attr-defined]
+
+
+def test_get_pause_after_test() -> None:
     manifest_json = {
         "items": {
             "testharness": {
@@ -77,3 +89,183 @@ def test_get_pause_after_test():  # type: ignore
                         manifest_filters=manifest_filters)
     print(loader.tests)
     assert get_pause_after_test(loader, **kwargs) is False
+
+
+def get_loader_with_fakes(
+    tmp_path: Path,
+    include: Optional[List[str]] = None,
+    include_file: Optional[str] = None,
+    exclude: Optional[List[str]] = None,
+    exclude_file: Optional[str] = None,
+) -> Tuple[TestQueueBuilder, TestLoader]:
+    repo_root = tmp_path / "wpt"
+    repo_root.mkdir()
+
+    test_paths = {
+        "/": TestRoot(str(repo_root), str(repo_root), str(repo_root / "MANIFEST.json"))
+    }
+
+    spec_dir = repo_root / "fake-spec"
+    spec_dir.mkdir()
+    test_filenames = [f"test-{i:03d}.html" for i in range(10)]
+    for test_filename in test_filenames:
+        with (spec_dir / test_filename).open("wb") as f:
+            f.write(b"<script src=/resources/testharness.js></script>")
+
+    product = Mock(spec=["name", "run_info_extras"], name="fake-product")
+    product.run_info_extras = Mock(spec=[], return_value={})
+
+    # Unfortunately this requires quite a lot of kwargs
+    return get_loader(
+        test_paths,
+        product,
+        chunk_type="none",
+        debug=None,
+        default_exclude=False,
+        enable_webtransport_h3=True,
+        exclude=exclude,
+        exclude_file=exclude_file,
+        exclude_tags=None,
+        fully_parallel=False,
+        include=include,
+        include_file=include_file,
+        include_manifest=None,
+        manifest_download=False,
+        manifest_update=True,
+        processes=1,
+        run_by_dir=False,
+        run_info=str(repo_root / "tools/wptrunner/wptrunner.default.ini"),
+        skip_crash=False,
+        skip_implementation_status=None,
+        skip_timeout=False,
+        ssl_type="pregenerated",
+        subsuite_file=None,
+        subsuites=None,
+        tags=None,
+        test_groups_file=None,
+        test_types={"crashtest", "print-reftest", "reftest", "testharness", "wdspec"},
+        this_chunk=1,
+        total_chunks=1,
+    )
+
+
+def test_get_loader(tmp_path: Path) -> None:
+    _, test_loader = get_loader_with_fakes(tmp_path)
+
+    assert test_loader.test_ids == [
+        "/fake-spec/test-000.html",
+        "/fake-spec/test-001.html",
+        "/fake-spec/test-002.html",
+        "/fake-spec/test-003.html",
+        "/fake-spec/test-004.html",
+        "/fake-spec/test-005.html",
+        "/fake-spec/test-006.html",
+        "/fake-spec/test-007.html",
+        "/fake-spec/test-008.html",
+        "/fake-spec/test-009.html",
+    ]
+
+
+def test_get_loader_include(tmp_path: Path) -> None:
+    _, test_loader = get_loader_with_fakes(
+        tmp_path,
+        include=["/fake-spec/test-007.html", "/fake-spec/test-008.html"],
+    )
+
+    assert test_loader.test_ids == [
+        "/fake-spec/test-007.html",
+        "/fake-spec/test-008.html",
+    ]
+
+
+def test_get_loader_exclude(tmp_path: Path) -> None:
+    _, test_loader = get_loader_with_fakes(
+        tmp_path,
+        exclude=["/fake-spec/test-007.html"],
+    )
+
+    assert test_loader.test_ids == [
+        "/fake-spec/test-000.html",
+        "/fake-spec/test-001.html",
+        "/fake-spec/test-002.html",
+        "/fake-spec/test-003.html",
+        "/fake-spec/test-004.html",
+        "/fake-spec/test-005.html",
+        "/fake-spec/test-006.html",
+        "/fake-spec/test-008.html",
+        "/fake-spec/test-009.html",
+    ]
+
+
+def test_get_loader_include_exclude(tmp_path: Path) -> None:
+    _, test_loader = get_loader_with_fakes(
+        tmp_path,
+        include=["/fake-spec/test-007.html", "/fake-spec/test-008.html"],
+        exclude=["/fake-spec/test-007.html"],
+    )
+
+    assert test_loader.test_ids == [
+        "/fake-spec/test-008.html",
+    ]
+
+
+def test_get_loader_include_file(tmp_path: Path) -> None:
+    include = ["/fake-spec/test-007.html", "/fake-spec/test-008.html"]
+
+    with (tmp_path / "include.txt").open("w") as f:
+        f.writelines([f"{t}\n" for t in include])
+
+    _, test_loader = get_loader_with_fakes(
+        tmp_path,
+        include_file=str(tmp_path / "include.txt"),
+    )
+
+    assert test_loader.test_ids == [
+        "/fake-spec/test-007.html",
+        "/fake-spec/test-008.html",
+    ]
+
+
+def test_get_loader_exclude_file(tmp_path: Path) -> None:
+    exclude = ["/fake-spec/test-007.html"]
+
+    with (tmp_path / "exclude.txt").open("w") as f:
+        f.writelines([f"{t}\n" for t in exclude])
+
+    _, test_loader = get_loader_with_fakes(
+        tmp_path,
+        exclude_file=str(tmp_path / "exclude.txt"),
+    )
+
+    assert test_loader.test_ids == [
+        "/fake-spec/test-000.html",
+        "/fake-spec/test-001.html",
+        "/fake-spec/test-002.html",
+        "/fake-spec/test-003.html",
+        "/fake-spec/test-004.html",
+        "/fake-spec/test-005.html",
+        "/fake-spec/test-006.html",
+        "/fake-spec/test-008.html",
+        "/fake-spec/test-009.html",
+    ]
+
+
+def test_get_loader_include_exclude_file(tmp_path: Path) -> None:
+    include = ["/fake-spec/test-007.html", "/fake-spec/test-008.html"]
+    exclude = ["/fake-spec/test-007.html"]
+
+    with (tmp_path / "include.txt").open("w") as f:
+        f.writelines([f"{t}\n" for t in include])
+
+    with (tmp_path / "exclude.txt").open("w") as f:
+        f.writelines([f"{t}\n" for t in exclude])
+
+    _, test_loader = get_loader_with_fakes(
+        tmp_path,
+        include_file=str(tmp_path / "include.txt"),
+        exclude_file=str(tmp_path / "exclude.txt"),
+    )
+
+    assert test_loader.test_ids == [
+        "/fake-spec/test-008.html",
+    ]
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py
index 421c003071e..d0fa4299965 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -159,6 +159,8 @@ scheme host and port.""")
                                       help="A file listing URL prefix for tests")
     test_selection_group.add_argument("--exclude", action="append",
                                       help="URL prefix to exclude")
+    test_selection_group.add_argument("--exclude-file", action="store",
+                                      help="A file listing URL prefix for tests")
     test_selection_group.add_argument("--include-manifest", type=abs_path,
                                       help="Path to manifest listing tests to include")
     test_selection_group.add_argument("--test-groups", dest="test_groups_file", type=abs_path,
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py
index 7d26bb76d75..23ad3b75859 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -85,16 +85,20 @@ def get_loader(test_paths: wptcommandline.TestPaths,
     include = kwargs["include"]
     if kwargs["include_file"]:
         include = include or []
-        include.extend(testloader.read_include_from_file(kwargs["include_file"]))
+        include.extend(testloader.read_test_prefixes_from_file(kwargs["include_file"]))
+    exclude = kwargs["exclude"]
+    if kwargs["exclude_file"]:
+        exclude = exclude or []
+        exclude.extend(testloader.read_test_prefixes_from_file(kwargs["exclude_file"]))
     if test_groups:
         include = testloader.update_include_for_groups(test_groups, include)
 
     if kwargs["tags"] or kwargs["exclude_tags"]:
         test_filters.append(testloader.TagFilter(kwargs["tags"], kwargs["exclude_tags"]))
 
-    if include or kwargs["exclude"] or kwargs["include_manifest"] or kwargs["default_exclude"]:
+    if include or exclude or kwargs["include_manifest"] or kwargs["default_exclude"]:
         manifest_filters.append(testloader.TestFilter(include=include,
-                                                      exclude=kwargs["exclude"],
+                                                      exclude=exclude,
                                                       manifest_path=kwargs["include_manifest"],
                                                       test_manifests=test_manifests,
                                                       explicit=kwargs["default_exclude"]))
@@ -258,24 +262,21 @@ def run_test_iteration(test_status, test_loader, test_queue_builder,
                 logger.test_end(test.id, status="SKIP", subsuite=subsuite_name)
                 test_status.skipped += 1
 
-            if test_type == "testharness":
-                for test in test_loader.tests[subsuite_name][test_type]:
-                    skip_reason = None
-                    if test.testdriver and not executor_cls.supports_testdriver:
-                        skip_reason = "Executor does not support testdriver.js"
-                    elif test.jsshell and not executor_cls.supports_jsshell:
-                        skip_reason = "Executor does not support jsshell"
-                    if skip_reason:
-                        logger.test_start(test.id, subsuite=subsuite_name)
-                        logger.test_end(test.id,
-                                        status="SKIP",
-                                        subsuite=subsuite_name,
-                                        message=skip_reason)
-                        test_status.skipped += 1
-                    else:
-                        tests_to_run[(subsuite_name, test_type)].append(test)
-            else:
-                tests_to_run[(subsuite_name, test_type)] = test_loader.tests[subsuite_name][test_type]
+            for test in test_loader.tests[subsuite_name][test_type]:
+                skip_reason = None
+                if getattr(test, "testdriver", False) and not executor_cls.supports_testdriver:
+                    skip_reason = "Executor does not support testdriver.js"
+                elif test_type == "testharness" and test.jsshell and not executor_cls.supports_jsshell:
+                    skip_reason = "Executor does not support jsshell"
+                if skip_reason:
+                    logger.test_start(test.id, subsuite=subsuite_name)
+                    logger.test_end(test.id,
+                                    status="SKIP",
+                                    subsuite=subsuite_name,
+                                    message=skip_reason)
+                    test_status.skipped += 1
+                else:
+                    tests_to_run[(subsuite_name, test_type)].append(test)
 
     unexpected_fail_tests = defaultdict(list)
     unexpected_pass_tests = defaultdict(list)
diff --git a/tests/wpt/tests/tools/wptrunner/wptrunner/wpttest.py b/tests/wpt/tests/tools/wptrunner/wptrunner/wpttest.py
index 2e3fd974d4d..42214f07e39 100644
--- a/tests/wpt/tests/tools/wptrunner/wptrunner/wpttest.py
+++ b/tests/wpt/tests/tools/wptrunner/wptrunner/wpttest.py
@@ -535,7 +535,7 @@ class ReftestTest(Test):
 
     def __init__(self, url_base, tests_root, url, inherit_metadata, test_metadata, references,
                  timeout=None, path=None, viewport_size=None, dpi=None, fuzzy=None,
-                 protocol="http", subdomain=False):
+                 protocol="http", subdomain=False, testdriver=False):
         Test.__init__(self, url_base, tests_root, url, inherit_metadata, test_metadata, timeout,
                       path, protocol, subdomain)
 
@@ -546,6 +546,7 @@ class ReftestTest(Test):
         self.references = references
         self.viewport_size = self.get_viewport_size(viewport_size)
         self.dpi = dpi
+        self.testdriver = testdriver
         self._fuzzy = fuzzy or {}
 
     @classmethod
@@ -553,7 +554,8 @@ class ReftestTest(Test):
         return {"viewport_size": manifest_test.viewport_size,
                 "dpi": manifest_test.dpi,
                 "protocol": server_protocol(manifest_test),
-                "fuzzy": manifest_test.fuzzy}
+                "fuzzy": manifest_test.fuzzy,
+                "testdriver": bool(getattr(manifest_test, "testdriver", False))}
 
     @classmethod
     def from_manifest(cls,
@@ -692,10 +694,10 @@ class PrintReftestTest(ReftestTest):
 
     def __init__(self, url_base, tests_root, url, inherit_metadata, test_metadata, references,
                  timeout=None, path=None, viewport_size=None, dpi=None, fuzzy=None,
-                 page_ranges=None, protocol="http", subdomain=False):
+                 page_ranges=None, protocol="http", subdomain=False, testdriver=False):
         super().__init__(url_base, tests_root, url, inherit_metadata, test_metadata,
                          references, timeout, path, viewport_size, dpi,
-                         fuzzy, protocol, subdomain=subdomain)
+                         fuzzy, protocol, subdomain=subdomain, testdriver=testdriver)
         self._page_ranges = page_ranges
 
     @classmethod
@@ -726,6 +728,26 @@ class CrashTest(Test):
     result_cls = CrashtestResult
     test_type = "crashtest"
 
+    def __init__(self, url_base, tests_root, url, inherit_metadata, test_metadata,
+                 timeout=None, path=None, protocol="http", subdomain=False, testdriver=False):
+        super().__init__(url_base, tests_root, url, inherit_metadata, test_metadata,
+                         timeout, path, protocol, subdomain=subdomain)
+        self.testdriver = testdriver
+
+    @classmethod
+    def from_manifest(cls, manifest_file, manifest_item, inherit_metadata, test_metadata):
+        timeout = cls.long_timeout if manifest_item.timeout == "long" else cls.default_timeout
+        return cls(manifest_file.url_base,
+                   manifest_file.tests_root,
+                   manifest_item.url,
+                   inherit_metadata,
+                   test_metadata,
+                   timeout=timeout,
+                   path=os.path.join(manifest_file.tests_root, manifest_item.path),
+                   protocol=server_protocol(manifest_item),
+                   subdomain=manifest_item.subdomain,
+                   testdriver=bool(getattr(manifest_item, "testdriver", False)))
+
 
 manifest_test_cls = {"reftest": ReftestTest,
                      "print-reftest": PrintReftestTest,
diff --git a/tests/wpt/tests/tools/wptserve/wptserve/handlers.py b/tests/wpt/tests/tools/wptserve/wptserve/handlers.py
index 62faf47d645..cde04b13cbb 100644
--- a/tests/wpt/tests/tools/wptserve/wptserve/handlers.py
+++ b/tests/wpt/tests/tools/wptserve/wptserve/handlers.py
@@ -513,11 +513,13 @@ class StaticHandler:
 
         Note that *.headers files have no effect in this handler.
 
-        :param path: Path to the template file to use
+        :param path: Path(s) to template files to use. If a sequence of paths is provided instead
+            of a single path, the contents of each file will be concatenated together before the
+            `format_args` are interpolated.
         :param format_args: Dictionary of values to substitute into the template file
         :param content_type: Content type header to server the response with
         :param headers: List of headers to send with responses"""
-        self._path = path
+        self._paths = [path] if isinstance(path, str) else path
         self._format_args = format_args
         self._content_type = content_type
         self._headers = headers
@@ -525,7 +527,7 @@ class StaticHandler:
 
     def __getnewargs_ex__(self):
         # Do not pickle `self._handler`, which can be arbitrarily large.
-        args = self._path, self._format_args, self._content_type
+        args = self._paths, self._format_args, self._content_type
         return args, self._headers
 
     def __call__(self, request, response):
@@ -534,8 +536,10 @@ class StaticHandler:
         # contents across processes can slow `wptserve` startup by several
         # seconds (crbug.com/1479850).
         if not self._handler:
-            with open(self._path) as f:
-                data = f.read()
+            data = ""
+            for path in self._paths:
+                with open(path) as f:
+                    data += f.read()
             if self._format_args:
                 data = data % self._format_args
             self._handler = StringHandler(data, self._content_type, **self._headers)
diff --git a/tests/wpt/tests/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-TT-realm.html b/tests/wpt/tests/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-TT-realm.html
new file mode 100644
index 00000000000..0b2e6b60645
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-TT-realm.html
@@ -0,0 +1,74 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+      const iframeSrcdoc = `
+      <!DOCTYPE html>
+        <head>
+        <meta charset="utf-8">
+        <meta
+        http-equiv="Content-Security-Policy"
+        content="require-trusted-types-for 'script'"
+        />
+      </head>
+        <body>
+          <div id="nonSVGTestElements">
+            <iframe id="iframe.srcdoc" srcdoc="v"></iframe>
+            <script id="script.src" src="v"><\/script>
+          </div>
+          <svg id="svgTestElements">
+            <script id="script.href" href="v"><\/script>
+            <script id="script.xlink:href" xlink:href="v"><\/script>
+          </svg>
+      </body>`;
+
+      const testCases = [
+        ['iframe', 'srcdoc'],
+        ['script', 'src'],
+        ['script', 'href'],
+        ['script', 'xlink:href'],
+      ];
+
+      const sourceFrame = document.createElement("iframe");
+      sourceFrame.srcdoc = iframeSrcdoc;
+      document.body.append(sourceFrame);
+
+      sourceFrame.addEventListener("load", () => {
+        testCases.forEach(testCase => {
+          async_test(t => {
+            t.step_func_done(() => {
+              const elementId = testCase.join(".");
+              const sourceElement =
+                sourceFrame.contentWindow.document.getElementById(elementId);
+              const sourceAttr = sourceElement.getAttributeNode(testCase[1]);
+              sourceElement.removeAttributeNode(sourceAttr);
+
+              document.body.append(sourceElement);
+              // Now `sourceElement`'s node document's global should belong to
+              // a non-TT realm.
+              // Hence, below calls of `setAttributeNode` and `setAttributeNS`
+              // should not throw.
+              // See the analogous test
+              // <Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-TT-realm.html>
+              // for details about the relevant specs.
+
+              sourceElement.setAttributeNode(sourceAttr);
+              sourceElement.setAttributeNS(sourceAttr.namespaceURI,
+                sourceAttr.name, sourceAttr.value);
+
+              assert_true(true,
+                "Neither `setAttributeNode` nor `setAttributeNS` threw");
+            })();
+          }, `Trusted types are not enforced for setAttributeNode and
+              setAttributeNS after moving the target node from a TT-realm to a
+              non-TT realm for ${testCase[0]}.${testCase[1]}`);
+        });
+      });
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/tests/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP.html b/tests/wpt/tests/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-non-TT-realm.html
similarity index 89%
rename from tests/wpt/tests/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP.html
rename to tests/wpt/tests/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-non-TT-realm.html
index aafe3c70313..6543ddb4b8b 100644
--- a/tests/wpt/tests/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP.html
+++ b/tests/wpt/tests/trusted-types/Element-setAttribute-respects-Elements-node-documents-globals-CSP-after-adoption-from-non-TT-realm.html
@@ -84,7 +84,13 @@
                 sourceElement.removeAttributeNode(sourceAttr);
 
                 document.body.append(sourceElement);
-                // Now `sourceElement`'s node document's global belongs to a TT-realm.
+                // Now `sourceElement`'s node document's global should belong to
+                // a TT-realm.
+                // Hence below calls to `setAttributeNode` and `setAttributeNS`
+                // should throw, because
+                // <https://github.com/whatwg/dom/pull/1268/files#diff-30f698d9b4650514daf7a04de5e44eebf8feff1a30e0505f8eeaf06703b2777dR6587>
+                // invokes <https://www.w3.org/TR/trusted-types/#validate-attribute-mutation>.
+                // The latter should throw when executing step 5.
 
                 assert_throws_js(sourceFrame.contentWindow.TypeError, () => {
                   sourceElement.setAttributeNode(sourceAttr);
diff --git a/tests/wpt/tests/trusted-types/Element-setAttributeNS.html b/tests/wpt/tests/trusted-types/Element-setAttributeNS.html
index 67e8236febd..537b08be89b 100644
--- a/tests/wpt/tests/trusted-types/Element-setAttributeNS.html
+++ b/tests/wpt/tests/trusted-types/Element-setAttributeNS.html
@@ -3,6 +3,7 @@
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="support/helper.sub.js"></script>
+  <script src="support/namespaces.js"></script>
 </head>
 <body>
 <script>
@@ -18,17 +19,9 @@
       assert_element_accepts_trusted_script_url_set_ns(window, '2', t, 'a', 'b', RESULTS.SCRIPTURL);
     }, "Element.setAttributeNS assigned via policy (successful ScriptURL transformation)");
 
-// TODO: Is there any non-URL, namespaced accessor left?
-/*
-    test(t => {
-      let p = createURL_policy(window, '5');
-      let url = p.createURL(INPUTS.URL);
-
-      let elem = document.createElementNS("http://www.w3.org/2000/svg", "image");
-      elem.setAttributeNS("http://www.w3.org/1999/xlink", "href", url);
-      let attr_node = elem.getAttributeNodeNS("http://www.w3.org/1999/xlink", "href");
-      assert_equals(attr_node.value + "", RESULTS.URL);
+    test(t=> {
+      const policy = trustedTypes.createPolicy("p", { createScriptURL: s => s + s });
+      assert_element_accepts_value_set_ns("image", "href", policy.createScriptURL("v"), "vv",
+        NSURI_SVG, NSURI_XLINK);
     }, "Element.setAttributeNS accepts a URL on <svg:image xlink:href/>");
-*/
-
 </script>
diff --git a/tests/wpt/tests/trusted-types/block-string-assignment-to-Element-setAttributeNS.html b/tests/wpt/tests/trusted-types/block-string-assignment-to-Element-setAttributeNS.html
index 78c8c0db989..ba9bcc20d24 100644
--- a/tests/wpt/tests/trusted-types/block-string-assignment-to-Element-setAttributeNS.html
+++ b/tests/wpt/tests/trusted-types/block-string-assignment-to-Element-setAttributeNS.html
@@ -4,7 +4,7 @@
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
   <script src="support/helper.sub.js"></script>
-
+  <script src="support/namespaces.js"></script>
   <meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script';">
 </head>
 <body>
@@ -25,11 +25,11 @@
 
     // Unknown attributes should not be TT checked:
     test(t => {
-      assert_element_accepts_non_trusted_type_set_ns('a', 'b', 'A string', 'A string', htmlNamespace, null);
+      assert_element_accepts_value_set_ns('a', 'b', 'A string', 'A string', htmlNamespace, null);
     }, "Element.setAttributeNS accepts untrusted string for non-specced accessor");
 
     test(t => {
-      assert_element_accepts_non_trusted_type_set_ns('a', 'b', null, 'null', htmlNamespace, null);
+      assert_element_accepts_value_set_ns('a', 'b', null, 'null', htmlNamespace, null);
     }, "Element.setAttributeNS accepts null for non-specced accessor");
 
     // Setup trusted values for use in subsequent tests.
@@ -37,25 +37,22 @@
     const html = createHTML_policy(window, '6').createHTML(INPUTS.HTML);
     const script = createScript_policy(window, '7').createScript(INPUTS.Script);
 
-    const xlinkNamespace = "http://www.w3.org/1999/xlink";
-    const svgNamespace = "http://www.w3.org/2000/svg";
-
     // svg:script xlink:href=... expects a TrustedScriptURL.
     // Assigning a TrustedScriptURL works.
     test(t => {
-      let elem = document.createElementNS(svgNamespace, "script");
-      elem.setAttributeNS(xlinkNamespace, "href", script_url);
+      let elem = document.createElementNS(NSURI_SVG, "script");
+      elem.setAttributeNS(NSURI_XLINK, "href", script_url);
       assert_equals("" + RESULTS.ScriptURL,
-                    elem.getAttributeNodeNS(xlinkNamespace, "href").value);
+                    elem.getAttributeNodeNS(NSURI_XLINK, "href").value);
     }, "Assigning TrustedScriptURL to <svg:script xlink:href=...> works");
 
     // Assigning things that ought to not work.
     test(t => {
-      let elem = document.createElementNS(svgNamespace, "script");
+      let elem = document.createElementNS(NSURI_SVG, "script");
       const values = [ "abc", null, html, script ];
       for (const v of values) {
         assert_throws_js(TypeError, _ => {
-          elem.setAttributeNS(xlinkNamespace, "href", v);
+          elem.setAttributeNS(NSURI_XLINK, "href", v);
         });
       }
     }, "Blocking non-TrustedScriptURL assignment to <svg:script xlink:href=...> works");
@@ -64,16 +61,16 @@
     const nonLowerCaseTests = [
       { element: "iframe", attribute: "SRCDOC", elementNamespace: htmlNamespace },
       { element: "script", attribute: "SRC", elementNamespace: htmlNamespace },
-      { element: "script", attribute: "HREF", elementNamespace: svgNamespace },
-      { element: "script", attribute: "HREF", elementNamespace: svgNamespace,
-        attributeNamespace: xlinkNamespace },
+      { element: "script", attribute: "HREF", elementNamespace: NSURI_SVG },
+      { element: "script", attribute: "HREF", elementNamespace: NSURI_SVG,
+        attributeNamespace: NSURI_XLINK },
     ];
 
     for (const testData of nonLowerCaseTests) {
       const attributeNamespace = testData.attributeNamespace ?? null;
 
       test(t => {
-        assert_element_accepts_non_trusted_type_set_ns(testData.element, testData.attribute, "v",
+        assert_element_accepts_value_set_ns(testData.element, testData.attribute, "v",
         "v", testData.elementNamespace, attributeNamespace);
       }, "Check `setAttributeNS` allows setting non-trusted string for non-lowercase attribute \"" +
          testData.attribute + "\" (ns=" + attributeNamespace + ") for \"" + testData.element +
diff --git a/tests/wpt/tests/trusted-types/eval-function-constructor-untrusted-arguments-and-default-policy-throwing.html b/tests/wpt/tests/trusted-types/eval-function-constructor-untrusted-arguments-and-default-policy-throwing.html
new file mode 100644
index 00000000000..a33fe2d0eb4
--- /dev/null
+++ b/tests/wpt/tests/trusted-types/eval-function-constructor-untrusted-arguments-and-default-policy-throwing.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <link rel="help" href="https://w3c.github.io/webappsec-csp/#can-compile-strings">
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script'">
+</head>
+<body>
+<script>
+  let policy = trustedTypes.createPolicy("p", {
+    createScript: s => { throw Error('createScript exception'); }
+  });
+  test(t => {
+    assert_throws_js(EvalError, _ => eval("1+2"));
+  }, `EvalError thrown if the callback of the default policy throws an error (eval).`);
+  test(t => {
+    assert_throws_js(EvalError, _ => new Function("return 3;"));
+  }, `EvalError thrown if the callback of the default policy throws an error (new Function).`);
+</script>
+</body>
+</html>
diff --git a/tests/wpt/tests/trusted-types/support/helper.sub.js b/tests/wpt/tests/trusted-types/support/helper.sub.js
index 1775cd985c2..dcde42a1673 100644
--- a/tests/wpt/tests/trusted-types/support/helper.sub.js
+++ b/tests/wpt/tests/trusted-types/support/helper.sub.js
@@ -158,7 +158,7 @@ function assert_throws_no_trusted_type_set_ns(tag, attribute, value) {
   });
 }
 
-function assert_element_accepts_non_trusted_type_set_ns(tag, attribute, value, expected,
+function assert_element_accepts_value_set_ns(tag, attribute, value, expected,
                                                         elementNamespace, attributeNamespace) {
   let elem = document.createElementNS(elementNamespace, tag);
   elem.setAttributeNS(attributeNamespace, attribute, value);
diff --git a/tests/wpt/tests/trusted-types/trusted-types-event-handlers.html b/tests/wpt/tests/trusted-types/trusted-types-event-handlers.html
index 8dd70757e34..3e41e02a462 100644
--- a/tests/wpt/tests/trusted-types/trusted-types-event-handlers.html
+++ b/tests/wpt/tests/trusted-types/trusted-types-event-handlers.html
@@ -6,6 +6,10 @@
 </head>
 <body>
 <script>
+// The default namespace of `setAttribute` is null, see step 4 of
+// <https://dom.spec.whatwg.org/#dom-element-setattribute>.
+// Hence call `setAttributeNS` with null.
+
 const element = document.createElement("div");
 
 [
@@ -18,6 +22,13 @@ const element = document.createElement("div");
   test(t => {
     assert_throws_js(TypeError,
         _ => element.setAttribute(name, "2+2"));
+
+    // `setAttributeNS` doesn't convert to lowercase, see
+    // <https://dom.spec.whatwg.org/#dom-element-setattributens>.
+    if (name == name.toLowerCase()) {
+      assert_throws_js(TypeError,
+          _ => element.setAttributeNS(null, name, "2+2"));
+    }
   }, `Event handler ${name} should be blocked.`);
 });
 
@@ -30,6 +41,7 @@ const element = document.createElement("div");
 ].forEach(name => {
   test(t => {
     element.setAttribute(name, "2+2");
+    element.setAttributeNS(null, name, "2+2");
   }, `Non-event handler ${name} should not be blocked.`);
 });
 
@@ -44,6 +56,8 @@ for(name in div.__proto__) {
     test(t => {
       assert_throws_js(TypeError,
           _ => element.setAttribute(name, "2+2"));
+      assert_throws_js(TypeError,
+          _ => element.setAttributeNS(null, name, "2+2"));
     }, `Event handler div.${name} should be blocked.`);
   } else {
     // Rather than going through all the non-event handler, we randomly choose
diff --git a/tests/wpt/tests/wasm/jsapi/jspi/notraps.any.js b/tests/wpt/tests/wasm/jsapi/jspi/notraps.any.js
new file mode 100644
index 00000000000..4060885f36c
--- /dev/null
+++ b/tests/wpt/tests/wasm/jsapi/jspi/notraps.any.js
@@ -0,0 +1,82 @@
+// META: global=window,dedicatedworker,jsshell
+// META: script=/wasm/jsapi/wasm-module-builder.js
+// META: script=/wasm/jsapi/jspi/testharness-additions.js
+
+test(() => {
+    let builder = new WasmModuleBuilder();
+    let js_tag = builder.addImportedTag("", "tag", kSig_v_r);
+    let try_sig_index = builder.addType(kSig_i_v);
+
+    let promise42 = new WebAssembly.Suspending(() => Promise.resolve(42));
+    let kPromise42Ref = builder.addImport("", "promise42", kSig_i_v);
+
+    builder.addFunction("test", kSig_i_v)
+        .addBody([
+        kExprTry, try_sig_index,
+            kExprCallFunction, kPromise42Ref,
+            kExprReturn,  // If there was no trap or exception, return
+        kExprCatch, js_tag,
+            kExprI32Const, 43,
+            kExprReturn,
+        kExprEnd,
+        ])
+        .exportFunc();
+
+    let instance = builder.instantiate({"": {
+        promise42: promise42,
+        tag: WebAssembly.JSTag,
+    }});
+
+    assert_equals(43, instance.exports.test());
+  },"catch SuspendError");
+
+promise_test(async t=>{
+    let builder = new WasmModuleBuilder();
+    let js_tag = builder.addImportedTag("", "tag", kSig_v_r);
+    let try_sig_index = builder.addType(kSig_i_v);
+
+    let promise42 = new WebAssembly.Suspending(() => Promise.resolve(42));
+    let kPromise42Ref = builder.addImport("", "promise42", kSig_i_v);
+    let backChnnlRef = builder.addImport("","backChnnl",kSig_i_v);
+
+    builder.addFunction("main", kSig_i_v)
+      .addBody([
+        kExprTry, try_sig_index,
+          kExprCallFunction, backChnnlRef,
+          kExprReturn,  // If there was no trap or exception, return
+        kExprCatch, js_tag,
+          kExprI32Const, 43,
+          kExprReturn,
+        kExprEnd,
+      ])
+      .exportFunc();
+
+      builder.addFunction("inner", kSig_i_v)
+      .addBody([
+        kExprCallFunction, kPromise42Ref,
+      ])
+      .exportFunc();
+
+    let backChnnl = ()=>instance.exports.inner();
+    let instance = builder.instantiate({"": {
+        promise42: promise42,
+        backChnnl: backChnnl,
+        tag: WebAssembly.JSTag,
+    }});
+
+    wrapped_export = WebAssembly.promising(instance.exports.main);
+
+    assert_equals(await wrapped_export(), 43);
+  },"throw on reentrance");
+
+test(() => {
+  let builder = new WasmModuleBuilder();
+  import_index = builder.addImport('m', 'import', kSig_v_v);
+  builder.addFunction("test", kSig_v_v)
+      .addBody([
+          kExprCallFunction, import_index,
+      ]).exportFunc();
+  let js_import = new WebAssembly.Suspending(() => Promise.resolve());
+  let instance = builder.instantiate({m: {import: js_import}});
+  assert_throws_js(WebAssembly.SuspendError, instance.exports.test);
+},"unwrapped export");
diff --git a/tests/wpt/tests/wasm/jsapi/jspi/rejects.any.js b/tests/wpt/tests/wasm/jsapi/jspi/rejects.any.js
index 44315319318..55c5abc9a8a 100644
--- a/tests/wpt/tests/wasm/jsapi/jspi/rejects.any.js
+++ b/tests/wpt/tests/wasm/jsapi/jspi/rejects.any.js
@@ -145,6 +145,6 @@ promise_test(async (t) => {
   });
   // export1 (promising)
   let wrapper = WebAssembly.promising(instance.exports.export1);
-  promise_rejects_js(t, WebAssembly.RuntimeError, wrapper(),
+  promise_rejects_js(t, WebAssembly.SuspendError, wrapper(),
       "trying to suspend JS frames");
 }, "Try to suspend JS");
\ No newline at end of file
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/navigation.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/navigation.py
index 21109f1a680..e40c582b05f 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/navigation.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/navigation.py
@@ -1,8 +1,6 @@
 import pytest
-import webdriver.bidi.error as error
 from webdriver.bidi.modules.input import Actions, get_element_origin
 
-from . import get_element_rect
 from .. import get_events
 
 pytestmark = pytest.mark.asyncio
@@ -28,7 +26,7 @@ PAGE_CONTENT = """
 """
 
 
-async def test_key(bidi_session, inline, top_context, get_element):
+async def test_key(bidi_session, inline, top_context):
     await bidi_session.browsing_context.navigate(
         context=top_context["context"],
         url=inline(f"""
@@ -40,7 +38,6 @@ async def test_key(bidi_session, inline, top_context, get_element):
             """),
         wait="complete"
     )
-    input = await get_element("input")
 
     actions = Actions()
     (
@@ -56,8 +53,9 @@ async def test_key(bidi_session, inline, top_context, get_element):
         actions=actions, context=top_context["context"]
     )
 
-    with pytest.raises(error.NoSuchNodeException):
-        await get_element_rect(bidi_session, context=top_context, element=input)
+    # Check that the page was navigated
+    info = await bidi_session.browsing_context.get_tree(max_depth=1)
+    assert info[0]["url"] == inline(PAGE_CONTENT)
 
     events = await get_events(bidi_session, top_context["context"])
     assert len(events) == 1
@@ -87,8 +85,9 @@ async def test_pointer(bidi_session, inline, top_context, get_element):
         actions=actions, context=top_context["context"]
     )
 
-    with pytest.raises(error.NoSuchNodeException):
-        await get_element_rect(bidi_session, context=top_context, element=input)
+    # Check that the page was navigated
+    info = await bidi_session.browsing_context.get_tree(max_depth=1)
+    assert info[0]["url"] == inline(PAGE_CONTENT)
 
     events = await get_events(bidi_session, top_context["context"])
     assert len(events) == 1
diff --git a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse_drag.py b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse_drag.py
index 7cd2e386c67..df4a98c2f8a 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse_drag.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/input/perform_actions/pointer_mouse_drag.py
@@ -9,6 +9,7 @@ from . import get_element_rect, get_inview_center_bidi
 
 pytestmark = pytest.mark.asyncio
 
+
 @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)]
@@ -54,12 +55,13 @@ async def test_drag_and_drop(
     assert e["type"] == "mouseup"
     assert e["pageX"] == pytest.approx(initial_center["x"] + dx, abs=1.0)
     assert e["pageY"] == pytest.approx(initial_center["y"] + dy, abs=1.0)
+
     # check resulting location of the dragged element
     final_rect = await get_element_rect(
         bidi_session, context=top_context, element=drag_target
     )
-    assert initial_rect["x"] + dx == final_rect["x"]
-    assert initial_rect["y"] + dy == final_rect["y"]
+    assert final_rect["x"] == pytest.approx(initial_rect["x"] + dx, abs=1.0)
+    assert final_rect["y"] == pytest.approx(initial_rect["y"] + dy, abs=1.0)
 
 
 @pytest.mark.parametrize("drag_duration", [0, 300, 800])
diff --git a/tests/wpt/tests/webdriver/tests/bidi/storage/delete_cookies/partition.py b/tests/wpt/tests/webdriver/tests/bidi/storage/delete_cookies/partition.py
index 4e0ca081bcd..07057967b67 100644
--- a/tests/wpt/tests/webdriver/tests/bidi/storage/delete_cookies/partition.py
+++ b/tests/wpt/tests/webdriver/tests/bidi/storage/delete_cookies/partition.py
@@ -132,7 +132,7 @@ async def test_partition_context_iframe(
     )
 
     result = await bidi_session.storage.delete_cookies(partition=frame_partition)
-    await assert_partition_key(bidi_session, actual=result["partitionKey"], context=new_tab["context"])
+    await assert_partition_key(bidi_session, actual=result["partitionKey"], context=iframe_context["context"])
 
     await assert_cookies_are_not_present(bidi_session, frame_partition)
 
diff --git a/tests/wpt/tests/webdriver/tests/classic/perform_actions/navigation.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/navigation.py
index 6f5a4c98f0a..530327c0dbb 100644
--- a/tests/wpt/tests/webdriver/tests/classic/perform_actions/navigation.py
+++ b/tests/wpt/tests/webdriver/tests/classic/perform_actions/navigation.py
@@ -1,6 +1,3 @@
-import pytest
-import webdriver.error as error
-
 from tests.classic.perform_actions.support.refine import get_events
 
 PAGE_CONTENT = """
@@ -32,7 +29,6 @@ def test_key(session, inline, key_chain):
             input.focus();
         </script>
         """)
-    input = session.find.css("input", all=False)
 
     key_chain \
         .key_down("1") \
@@ -42,8 +38,7 @@ def test_key(session, inline, key_chain):
         .key_up("2") \
         .perform()
 
-    with pytest.raises(error.StaleElementReferenceException):
-        input.rect
+    assert session.url == inline(PAGE_CONTENT)
 
     events = get_events(session)
     assert len(events) == 1
@@ -63,8 +58,7 @@ def test_pointer(session, inline, mouse_chain):
         .pointer_move(x=200, y=200) \
         .perform()
 
-    with pytest.raises(error.StaleElementReferenceException):
-        input.rect
+    assert session.url == inline(PAGE_CONTENT)
 
     events = get_events(session)
     assert len(events) == 1
diff --git a/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_mouse.py b/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_mouse.py
index a3ff8ae80a9..a3dff9ec9c5 100644
--- a/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_mouse.py
+++ b/tests/wpt/tests/webdriver/tests/classic/perform_actions/pointer_mouse.py
@@ -293,6 +293,7 @@ def test_drag_and_drop(session,
     drag_target = session.find.css("#dragTarget", all=False)
     initial_rect = drag_target.rect
     initial_center = get_inview_center(initial_rect, get_viewport_rect(session))
+
     # Conclude chain with extra move to allow time for last queued
     # coordinate-update of drag_target and to test that drag_target is "dropped".
     mouse_chain \
@@ -302,15 +303,17 @@ def test_drag_and_drop(session,
         .pointer_up() \
         .pointer_move(80, 50, duration=100, origin="pointer") \
         .perform()
+
     # mouseup that ends the drag is at the expected destination
     e = get_events(session)[1]
     assert e["type"] == "mouseup"
     assert e["pageX"] == pytest.approx(initial_center["x"] + dx, abs=1.0)
     assert e["pageY"] == pytest.approx(initial_center["y"] + dy, abs=1.0)
+
     # check resulting location of the dragged element
     final_rect = drag_target.rect
-    assert initial_rect["x"] + dx == final_rect["x"]
-    assert initial_rect["y"] + dy == final_rect["y"]
+    assert final_rect["x"] == pytest.approx(initial_rect["x"] + dx, abs=1.0)
+    assert final_rect["y"] == pytest.approx(initial_rect["y"] + dy, abs=1.0)
 
 
 @pytest.mark.parametrize("drag_duration", [0, 300, 800])
diff --git a/tests/wpt/tests/webidl/ecmascript-binding/es-exceptions/DOMException-is-error.any.js b/tests/wpt/tests/webidl/ecmascript-binding/es-exceptions/DOMException-is-error.any.js
new file mode 100644
index 00000000000..6f3097b222e
--- /dev/null
+++ b/tests/wpt/tests/webidl/ecmascript-binding/es-exceptions/DOMException-is-error.any.js
@@ -0,0 +1,9 @@
+// META: global=window,dedicatedworker,shadowrealm
+
+'use strict';
+
+test(function() {
+  // https://github.com/tc39/proposal-is-error/issues/9
+  // https://github.com/whatwg/webidl/pull/1421
+  assert_true(Error.isError(new DOMException()));
+});
diff --git a/tests/wpt/tests/webnn/conformance_tests/gemm.https.any.js b/tests/wpt/tests/webnn/conformance_tests/gemm.https.any.js
index 7f8181dd5dd..86912305f9a 100644
--- a/tests/wpt/tests/webnn/conformance_tests/gemm.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/gemm.https.any.js
@@ -1257,6 +1257,1156 @@ const gemmTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'gemm two float16 2D tensors (b is non-constant) default options',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.654296875, 0.37451171875, 0.708984375, 0.7578125,
+            0.07781982421875, 0.1444091796875, 0.214111328125, 0.73291015625,
+            0.9384765625, 0.218505859375, 0.69140625, 0.85400390625
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.98974609375, 0.1365966796875, 0.442626953125, 0.501953125,
+            0.3447265625,  0.208251953125,  0.64697265625,  0.88037109375,
+            0.83203125,    0.826171875,     0.52978515625,  0.51904296875,
+            0.57080078125, 0.74072265625,   0.8125,         0.6103515625,
+            0.72509765625, 0.487548828125,  0.126220703125, 0.5703125
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            1.5634765625, 1.2490234375, 1.3935546875, 1.2607421875, 1.54296875,
+            0.66796875, 0.74658203125, 0.64111328125, 0.410400390625,
+            0.73828125, 1.8623046875, 1.248046875, 1.4189453125, 1.2724609375,
+            1.552734375
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm two float16 2D tensors default options',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.074951171875, 0.03216552734375, 0.501953125, 0.650390625,
+            0.447021484375, 0.6201171875, 0.027099609375, 0.72021484375,
+            0.60009765625, 0.246826171875, 0.9169921875, 0.767578125
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.4384765625,   0.80517578125, 0.09515380859375, 0.2376708984375,
+            0.84912109375,  0.79296875,    0.33154296875,    0.66455078125,
+            0.46826171875,  0.55712890625, 0.587890625,      0.611328125,
+            0.464111328125, 0.74267578125, 0.43505859375,    0.68310546875,
+            0.309814453125, 0.5908203125,  0.088134765625,   0.07745361328125
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            0.7978515625, 0.57958984375, 0.6455078125, 0.462890625,
+            0.350341796875, 1.1953125, 0.80517578125, 0.892578125,
+            0.480224609375, 0.79248046875, 1.5224609375, 1.36328125,
+            1.1005859375, 1.0068359375, 1.10546875
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm two float16 2D constant tensors options.c',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.74365234375, 0.465576171875, 0.99755859375, 0.5576171875,
+            0.3115234375, 0.47509765625, 0.468994140625, 0.340576171875,
+            0.1337890625, 0.395263671875, 0.80224609375, 0.60986328125
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'},
+          'constant': true
+        },
+        'inputB': {
+          'data': [
+            0.46435546875,  0.31298828125,  0.2039794921875, 0.39697265625,
+            0.76171875,     0.366455078125, 0.35595703125,   0.1937255859375,
+            0.450927734375, 0.7958984375,   0.167724609375,  0.2998046875,
+            0.54833984375,  0.72265625,     0.56640625,      0.93896484375,
+            0.92333984375,  0.67138671875,  0.822265625,     0.55029296875
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        },
+        'inputC': {
+          'data': [
+            0.00004869699478149414, 0.143798828125, 0.87158203125, 0.8759765625,
+            0.87353515625, 0.9501953125, 0.87353515625, 0.1787109375,
+            0.3935546875, 0.23583984375, 0.048431396484375, 0.157958984375,
+            0.0894775390625, 0.19287109375, 0.4462890625
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments':
+            [{'a': 'inputA'}, {'b': 'inputB'}, {'options': {'c': 'inputC'}}],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            1.20703125, 1.3564453125, 2.03515625, 2.560546875, 2.681640625,
+            1.6669921875, 1.595703125, 0.8203125, 1.3505859375, 1.3046875,
+            0.96240234375, 1.14453125, 1.04296875, 1.505859375, 1.65234375
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm two float16 2D tensors options.c',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.17431640625, 0.09527587890625, 0.83935546875, 0.2127685546875,
+            0.1314697265625, 0.48095703125, 0.248779296875, 0.043670654296875,
+            0.1619873046875, 0.9384765625, 0.12188720703125, 0.8056640625
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.1759033203125, 0.8759765625,       0.3544921875,    0.216796875,
+            0.8408203125,    0.0220184326171875, 0.7646484375,    0.8779296875,
+            0.2392578125,    0.38525390625,      0.0938720703125, 0.57958984375,
+            0.4638671875,    0.6982421875,       0.7900390625,    0.77099609375,
+            0.744140625,     0.25537109375,      0.97900390625,   0.890625
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        },
+        'inputC': {
+          'data': [
+            0.947265625, 0.61767578125, 0.7177734375, 0.175537109375,
+            0.468994140625, 0.378662109375, 0.646484375, 0.48583984375,
+            0.9921875, 0.046356201171875, 0.200439453125, 0.69677734375,
+            0.054534912109375, 0.732421875, 0.97216796875
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments':
+            [{'a': 'inputA'}, {'b': 'inputB'}, {'options': {'c': 'inputC'}}],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            1.22265625, 1.48828125, 1.306640625, 1.0302734375, 1.5048828125,
+            0.469482421875, 1.3056640625, 1.0810546875, 1.3525390625,
+            0.57763671875, 0.88232421875, 2.2265625, 1.1982421875, 1.8662109375,
+            2.283203125
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm two float16 2D tensors broadcast options.c [1, 5] => [3, 5]',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.98681640625, 0.7919921875, 0.31298828125, 0.0943603515625,
+            0.6806640625, 0.7177734375, 0.4150390625, 0.1239013671875,
+            0.744140625, 0.311279296875, 0.54345703125, 0.2401123046875
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.249267578125, 0.63623046875,   0.226806640625,
+            0.802734375,    0.88525390625,   0.27880859375,
+            0.9345703125,   0.2093505859375, 0.77294921875,
+            0.86669921875,  0.284912109375,  0.274658203125,
+            0.125244140625, 0.43408203125,   0.005023956298828125,
+            0.276123046875, 0.583984375,     0.1583251953125,
+            0.53662109375,  0.52490234375
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        },
+        'inputC': {
+          'data': [
+            0.093994140625, 0.94384765625, 0.751953125, 0.01458740234375,
+            0.822265625
+          ],
+          'descriptor': {shape: [1, 5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments':
+            [{'a': 'inputA'}, {'b': 'inputB'}, {'options': {'c': 'inputC'}}],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            0.67578125, 2.453125, 1.1953125, 1.60546875, 2.43359375,
+            0.6162109375, 2.234375, 1.1279296875, 1.3623046875, 2.11328125,
+            0.58740234375, 1.998046875, 1.091796875, 1.2177734375, 1.8798828125
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm two float16 2D tensors broadcast options.c [3, 1] => [3, 5]',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.99755859375, 0.139892578125, 0.255126953125, 0.347900390625,
+            0.81298828125, 0.271484375, 0.47607421875, 0.137939453125,
+            0.8134765625, 0.42138671875, 0.14306640625, 0.595703125
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.82568359375,  0.8203125,     0.93017578125,     0.669921875,
+            0.73486328125,  0.974609375,   0.4951171875,      0.95361328125,
+            0.393798828125, 0.55419921875, 0.6474609375,      0.1678466796875,
+            0.68798828125,  0.89990234375, 0.08148193359375,  0.67626953125,
+            0.3095703125,   0.826171875,   0.025726318359375, 0.9970703125
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        },
+        'inputC': {
+          'data': [0.424072265625, 0.19873046875, 0.69189453125],
+          'descriptor': {shape: [3, 1], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments':
+            [{'a': 'inputA'}, {'b': 'inputB'}, {'options': {'c': 'inputC'}}],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            1.7841796875, 1.4619140625, 1.9482421875, 1.3857421875,
+            1.6025390625, 1.5361328125, 1.123046875, 1.6552734375, 1.2822265625,
+            1.123046875, 2.26953125, 1.7763671875, 2.44140625, 1.546875,
+            2.12890625
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm two float16 2D tensors broadcast options.c [1, 1] => [3, 5]',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.68896484375, 0.26171875, 0.78662109375, 0.2275390625,
+            0.77294921875, 0.97021484375, 0.1256103515625, 0.98486328125,
+            0.59326171875, 0.328125, 0.6611328125, 0.339599609375
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.298583984375, 0.99267578125,    0.85546875,    0.94384765625,
+            0.994140625,    0.05615234375,    0.16845703125, 0.6943359375,
+            0.83203125,     0.06951904296875, 0.9658203125,  0.11956787109375,
+            0.7548828125,   0.29638671875,    0.58203125,    0.02618408203125,
+            0.55859375,     0.034912109375,   0.97802734375, 0.70263671875
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        },
+        'inputC': {
+          'data': [0.425048828125],
+          'descriptor': {shape: [1, 1], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments':
+            [{'a': 'inputA'}, {'b': 'inputB'}, {'options': {'c': 'inputC'}}],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            1.4111328125, 1.3740234375, 1.7978515625, 1.7490234375, 1.74609375,
+            0.857421875, 1.9208984375, 1.888671875, 2.962890625, 2.025390625,
+            1.267578125, 1.337890625, 1.6708984375, 1.7861328125, 1.6611328125
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm two float16 2D tensors broadcast options.c [5] => [3, 5]',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.0216827392578125, 0.85888671875, 0.48095703125, 0.487548828125,
+            0.91064453125, 0.86328125, 0.8046875, 0.224853515625, 0.50341796875,
+            0.5478515625, 0.67724609375, 0.66015625
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.83642578125,     0.473876953125, 0.363037109375, 0.5498046875,
+            0.4609375,         0.281982421875, 0.421142578125, 0.2330322265625,
+            0.80419921875,     0.1865234375,   0.383056640625, 0.2454833984375,
+            0.038421630859375, 0.35302734375,  0.431640625,    0.82177734375,
+            0.8759765625,      0.34716796875,  0.47119140625,  0.58154296875
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        },
+        'inputC': {
+          'data': [
+            0.7314453125, 0.0292816162109375, 0.8896484375, 0.424072265625,
+            0.09136962890625
+          ],
+          'descriptor': {shape: [5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments':
+            [{'a': 'inputA'}, {'b': 'inputB'}, {'options': {'c': 'inputC'}}],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            1.5771484375, 0.9462890625, 1.28515625, 1.5263671875, 0.7529296875,
+            2.23046875, 1.21875, 1.5302734375, 2.009765625, 1.150390625,
+            2.109375, 1.2431640625, 1.455078125, 1.69140625, 1.1015625
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm two float16 2D tensors broadcast options.c [1] => [3, 5]',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.5712890625, 0.83447265625, 0.35693359375, 0.326904296875,
+            0.1727294921875, 0.1966552734375, 0.9404296875, 0.724609375,
+            0.630859375, 0.53759765625, 0.72021484375, 0.88525390625
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.91552734375, 0.85009765625, 0.2169189453125, 0.430908203125,
+            0.30810546875, 0.88916015625, 0.9931640625,    0.705078125,
+            0.55126953125, 0.91259765625, 0.92431640625,   0.148681640625,
+            0.4306640625,  0.69921875,    0.24658203125,   0.19287109375,
+            0.5263671875,  0.98095703125, 0.80322265625,   0.407958984375
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        },
+        'inputC': {
+          'data': [0.755859375],
+          'descriptor': {shape: [1], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments':
+            [{'a': 'inputA'}, {'b': 'inputB'}, {'options': {'c': 'inputC'}}],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            2.4140625, 2.294921875, 1.9423828125, 1.974609375, 1.9150390625,
+            2.09765625, 1.619140625, 2.046875, 2.177734375, 1.515625, 2.6484375,
+            2.3984375, 2.451171875, 2.5390625, 1.9794921875
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm two float16 2D tensors scalar options.c',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.966796875, 0.87353515625, 0.9384765625, 0.9091796875,
+            0.81396484375, 0.73876953125, 0.1455078125, 0.08917236328125,
+            0.7900390625, 0.271484375, 0.21240234375, 0.393310546875
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.52587890625,   0.219482421875,   0.666015625,  0.5078125,
+            0.2279052734375, 0.12420654296875, 0.890625,     0.6884765625,
+            0.779296875,     0.7548828125,     0.92578125,   0.669921875,
+            0.60498046875,   0.1966552734375,  0.986328125,  0.533203125,
+            0.62744140625,   0.732421875,      0.5947265625, 0.33837890625
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        },
+        'inputC': {
+          'data': [0.95361328125],
+          'descriptor': {shape: [], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments':
+            [{'a': 'inputA'}, {'b': 'inputB'}, {'options': {'c': 'inputC'}}],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            2.923828125, 3.142578125, 3.431640625, 2.849609375, 3.06640625,
+            1.6552734375, 1.943359375, 2.158203125, 2.0234375, 1.8701171875,
+            1.8095703125, 1.7578125, 2.083984375, 1.841796875, 1.681640625
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm two float16 2D tensors options.alpha',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.455810546875, 0.89501953125, 0.1544189453125, 0.25244140625,
+            0.359130859375, 0.61376953125, 0.2164306640625, 0.347412109375,
+            0.90966796875, 0.91455078125, 0.59765625, 0.409912109375
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.084228515625, 0.6025390625,   0.370361328125, 0.474365234375,
+            0.93115234375,  0.72998046875,  0.76806640625,  0.759765625,
+            0.673828125,    0.480224609375, 0.12255859375,  0.71044921875,
+            0.90478515625,  0.1796875,      0.55322265625,  0.0193939208984375,
+            0.290771484375, 0.2197265625,   0.80859375,     0.102783203125
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments': [
+          {'a': 'inputA'}, {'b': 'inputB'},
+          {'options': {'alpha': 74.43204170482103}}
+        ],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            53.25, 85.25, 77.6875, 78.25, 71.875, 38.0625, 70.1875, 64.875,
+            67.25, 58.40625, 61.4375, 133.5, 123.75, 110.625, 123.5
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm two float16 2D tensors options.beta',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.371337890625, 0.97216796875, 0.51953125, 0.73974609375,
+            0.5126953125, 0.0809326171875, 0.44482421875, 0.421875,
+            0.2294921875, 0.609375, 0.441162109375, 0.748046875
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.3330078125,   0.7275390625,   0.229736328125, 0.122314453125,
+            0.176025390625, 0.84033203125,  0.392578125,    0.85205078125,
+            0.053955078125, 0.257080078125, 0.1416015625,   0.272705078125,
+            0.7294921875,   0.55615234375,  0.71630859375,  0.560546875,
+            0.6728515625,   0.5107421875,   0.36376953125,  0.92578125
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments': [
+          {'a': 'inputA'}, {'b': 'inputB'},
+          {'options': {'beta': 62.01828598608989}}
+        ],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            1.4287109375, 1.291015625, 1.6708984375, 0.65576171875,
+            1.3720703125, 0.5380859375, 0.81005859375, 0.7265625,
+            0.468017578125, 0.8203125, 1.0703125, 1.0302734375, 1.275390625,
+            0.57861328125, 1.2060546875
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm two float16 2D tensors options.c and options.beta',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.55615234375, 0.2451171875, 0.1129150390625, 0.6279296875,
+            0.3349609375, 0.0188751220703125, 0.09759521484375, 0.73828125,
+            0.67236328125, 0.4375, 0.271484375, 0.865234375
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.45361328125,   0.7060546875,    0.45751953125,    0.306640625,
+            0.41552734375,   0.271484375,     0.28076171875,    0.376708984375,
+            0.2457275390625, 0.283935546875,  0.72412109375,    0.52392578125,
+            0.7265625,       0.50390625,      0.08197021484375, 0.33154296875,
+            0.2176513671875, 0.1204833984375, 0.1644287109375,  0.2138671875
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        },
+        'inputC': {
+          'data': [
+            0.736328125, 0.85791015625, 0.9248046875, 0.92236328125,
+            0.9267578125, 0.377685546875, 0.319091796875, 0.2371826171875,
+            0.79736328125, 0.074462890625, 0.6376953125, 0.413818359375,
+            0.72265625, 0.90966796875, 0.767578125
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments': [
+          {'a': 'inputA'}, {'b': 'inputB'},
+          {'options': {'c': 'inputC', 'beta': 62.01828598608989}}
+        ],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            46.28125, 53.875, 57.84375, 57.59375, 57.90625, 23.890625, 20.25,
+            15.03125, 49.71875, 4.9296875, 40.46875, 26.59375, 45.59375, 57,
+            48.21875
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm two float16 2D tensors options.aTranspose being true',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.335693359375, 0.2005615234375, 0.2440185546875, 0.306396484375,
+            0.85693359375, 0.327880859375, 0.1824951171875, 0.47900390625,
+            0.6357421875, 0.15185546875, 0.8330078125, 0.55615234375
+          ],
+          'descriptor': {shape: [4, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.271240234375,  0.0931396484375, 0.84375,
+            0.796875,        0.195556640625,  0.79150390625,
+            0.59375,         0.8486328125,    0.01042938232421875,
+            0.0809326171875, 0.90869140625,   0.36083984375,
+            0.66748046875,   0.1376953125,    0.1590576171875,
+            0.513671875,     0.810546875,     0.6669921875,
+            0.39208984375,   0.97900390625
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments': [
+          {'a': 'inputA'}, {'b': 'inputB'}, {'options': {'aTranspose': true}}
+        ],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            0.57763671875, 0.402099609375, 0.7666015625, 0.35546875,
+            0.26806640625, 1.595703125, 1.3759765625, 1.771484375, 0.5615234375,
+            1, 1.189453125, 0.8974609375, 1.279296875, 0.50341796875,
+            0.7197265625
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'gemm two float16 2D tensors options.aTranspose being explicit false',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.61572265625, 0.9892578125, 0.81591796875, 0.8583984375,
+            0.47119140625, 0.56494140625, 0.91943359375, 0.174560546875,
+            0.295654296875, 0.77783203125, 0.324951171875, 0.708984375
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.650390625,    0.10198974609375,  0.49365234375,
+            0.322265625,    0.87060546875,     0.74072265625,
+            0.7001953125,   0.7138671875,      0.826171875,
+            0.42529296875,  0.57080078125,     0.54150390625,
+            0.320556640625, 0.59130859375,     0.1961669921875,
+            0.34228515625,  0.034515380859375, 0.669921875,
+            0.356201171875, 0.358154296875
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments': [
+          {'a': 'inputA'}, {'b': 'inputB'}, {'options': {'aTranspose': false}}
+        ],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            1.892578125, 1.2265625, 1.8466796875, 1.8037109375, 1.423828125,
+            1.3095703125, 0.94775390625, 1.0478515625, 1.224609375,
+            0.8935546875, 1.1962890625, 0.775390625, 1.2802734375, 1.1826171875,
+            0.90576171875
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm two float16 2D tensors options.bTranspose being true',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.58251953125, 0.024688720703125, 0.144775390625, 0.41162109375,
+            0.837890625, 0.5419921875, 0.75341796875, 0.435546875,
+            0.207275390625, 0.0222930908203125, 0.8896484375, 0.2578125
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.2349853515625, 0.39794921875, 0.64990234375,
+            0.62744140625,   0.4853515625,  0.397216796875,
+            0.6787109375,    0.65283203125, 0.2154541015625,
+            0.7177734375,    0.70166015625, 0.98193359375,
+            0.6708984375,    0.26318359375, 0.5478515625,
+            0.69873046875,   0.63623046875, 0.006359100341796875,
+            0.1671142578125, 0.60791015625
+          ],
+          'descriptor': {shape: [5, 4], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments': [
+          {'a': 'inputA'}, {'b': 'inputB'}, {'options': {'bTranspose': true}}
+        ],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            0.4990234375, 0.65966796875, 0.64892578125, 0.76416015625,
+            0.64501953125, 1.17578125, 1.41796875, 1.525390625, 1.421875,
+            0.92724609375, 0.79736328125, 0.88134765625, 0.93798828125, 0.8125,
+            0.4375
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'gemm two float16 2D tensors options.bTranspose being explicit false',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.84814453125, 0.66748046875, 0.424072265625, 0.7294921875,
+            0.93798828125, 0.787109375, 0.485595703125, 0.341064453125,
+            0.364501953125, 0.398681640625, 0.1600341796875, 0.98828125
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.1717529296875,   0.51953125,        0.40576171875,
+            0.73388671875,     0.1510009765625,   0.572265625,
+            0.890625,          0.69970703125,     0.58642578125,
+            0.09619140625,     0.9990234375,      0.6572265625,
+            0.035247802734375, 0.251708984375,    0.462158203125,
+            0.177001953125,    0.027984619140625, 0.1444091796875,
+            0.77099609375,     0.11273193359375
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments': [
+          {'a': 'inputA'}, {'b': 'inputB'}, {'options': {'bTranspose': false}}
+        ],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            1.080078125, 1.333984375, 0.931640625, 1.6826171875, 0.470458984375,
+            1.1572265625, 1.5166015625, 0.99755859375, 1.53515625,
+            0.480224609375, 0.62548828125, 0.67724609375, 0.5751953125,
+            1.3037109375, 0.27880859375
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm two float16 2D tensors all options',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.5048828125, 0.583984375, 0.11492919921875, 0.66845703125,
+            0.5654296875, 0.470458984375, 0.76904296875, 0.03497314453125,
+            0.76904296875, 0.413330078125, 0.300537109375, 0.73779296875
+          ],
+          'descriptor': {shape: [4, 3], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.84814453125,    0.861328125,    0.9736328125,  0.7001953125,
+            0.06622314453125, 0.79541015625,  0.5458984375,  0.712890625,
+            0.58642578125,    0.219970703125, 0.92236328125, 0.09332275390625,
+            0.1328125,        0.25439453125,  0.857421875,   0.794921875,
+            0.60009765625,    0.422119140625, 0.5068359375,  0.1951904296875
+          ],
+          'descriptor': {shape: [5, 4], dataType: 'float16'},
+          'constant': true
+        },
+        'inputC': {
+          'data': [
+            0.79150390625, 0.434326171875, 0.432861328125, 0.85205078125,
+            0.314453125, 0.07110595703125, 0.8798828125, 0.037017822265625,
+            0.68798828125, 0.84765625, 0.859375, 0.285400390625, 0.63720703125,
+            0.6015625, 0.96826171875
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments': [
+          {'a': 'inputA'}, {'b': 'inputB'}, {
+            'options': {
+              'c': 'inputC',
+              'alpha': 74.43204170482103,
+              'beta': 62.01828598608989,
+              'aTranspose': true,
+              'bTranspose': true
+            }
+          }
+        ],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            201.125, 122.1875, 115.5, 144, 98.0625, 95.75, 108.3125, 41.53125,
+            79.1875, 102.125, 184.875, 116.5, 110.1875, 140.125, 119.6875
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm both negative options.alpha and 1st float16 input tensor',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.373779296875, 0.314208984375, 0.775390625, 0.712890625,
+            0.1170654296875, 0.1820068359375, 0.81640625, 0.4609375,
+            0.59912109375, 0.0888671875, 0.52734375, 0.65869140625
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.673828125,  0.45703125,     0.9619140625,  0.7275390625,
+            0.9013671875, 0.837890625,    0.88330078125, 0.744140625,
+            0.076171875,  0.283447265625, 0.59228515625, 0.47119140625,
+            0.9794921875, 0.595703125,    0.578125,      0.71142578125,
+            0.8974609375, 0.83447265625,  0.36962890625, 0.689453125
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        },
+        'inputC': {
+          'data': [
+            0.367431640625, 0.8427734375, 0.0340576171875, 0.7353515625,
+            0.048309326171875, 0.9326171875, 0.623046875, 0.93017578125,
+            0.049896240234375, 0.9501953125, 0.53369140625, 0.12109375,
+            0.154296875, 0.9443359375, 0.293212890625
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments': [
+          {'a': 'inputA'}, {'b': 'inputB'},
+          {'options': {'c': 'inputC', 'alpha': -22.611149749186296}}
+        ],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            -33.125, -32.03125, -44, -22.359375, -30.828125, -22.640625,
+            -22.28125, -31.453125, -17.03125, -20.453125, -27.9375, -26.828125,
+            -38.46875, -21.671875, -29.65625
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'gemm both negative options.alpha and 2nd float16 input tensor',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.7666015625, 0.97216796875, 0.0718994140625, 0.2430419921875,
+            0.0016126632690429688, 0.544921875, 0.32177734375, 0.5556640625,
+            0.4990234375, 0.384765625, 0.51171875, 0.18212890625
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.265625,        0.7099609375,      0.7265625,
+            0.57080078125,   0.8330078125,      0.1624755859375,
+            0.28759765625,   0.6552734375,      0.97509765625,
+            0.42822265625,   0.016632080078125, 0.13818359375,
+            0.1358642578125, 0.525390625,       0.384765625,
+            0.17626953125,   0.10430908203125,  0.7548828125,
+            0.8330078125,    0.2169189453125
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        },
+        'inputC': {
+          'data': [
+            0.285888671875, 0.1680908203125, 0.93798828125, 0.357177734375,
+            0.07672119140625, 0.38671875, 0.5224609375, 0.83837890625,
+            0.051422119140625, 0.173095703125, 0.00557708740234375,
+            0.323486328125, 0.2587890625, 0.30322265625, 0.5576171875
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments': [
+          {'a': 'inputA'}, {'b': 'inputB'},
+          {'options': {'c': 'inputC', 'alpha': -22.611149749186296}}
+        ],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            -8.8828125, -19.265625, -30.421875, -36.40625, -25.59375,
+            -3.9609375, -5.36328125, -17.734375, -26.265625, -10.65625,
+            -5.32421875, -12.21875, -18.328125, -24.125, -17.90625
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'gemm both negative options.beta and 3rd float16 input tensor (options.c)',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.85400390625, 0.70458984375, 0.76416015625, 0.982421875,
+            0.470458984375, 0.310546875, 0.68408203125, 0.83935546875,
+            0.52294921875, 0.5234375, 0.79736328125, 0.10626220703125
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.955078125,    0.25537109375,  0.68505859375,   0.29296875,
+            0.36962890625,  0.479248046875, 0.599609375,     0.16455078125,
+            0.59375,        0.759765625,    0.325927734375,  0.9853515625,
+            0.348388671875, 0.428466796875, 0.1644287109375, 0.371337890625,
+            0.343505859375, 0.434814453125, 0.0859375,       0.148193359375
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        },
+        'inputC': {
+          'data': [
+            0.09210205078125, 0.869140625, 0.186279296875, 0.9111328125,
+            0.80224609375, 0.70703125, 0.51904296875, 0.78466796875,
+            0.43310546875, 0.884765625, 0.452880859375, 0.052764892578125,
+            0.83740234375, 0.8994140625, 0.68896484375
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments': [
+          {'a': 'inputA'}, {'b': 'inputB'},
+          {'options': {'c': 'inputC', 'beta': -11.68521964935509}}
+        ],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            0.69091796875, -8.421875, -0.7822265625, -9.5625, -8.25,
+            -7.12890625, -4.796875, -8.1953125, -4.375, -9.6953125, -4.2421875,
+            0.65283203125, -9.015625, -9.6953125, -7.3125
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'gemm float16 input tensors with both negative options.alpha and options.beta',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.623046875, 0.5673828125, 0.568359375, 0.218017578125,
+            0.29833984375, 0.425048828125, 0.59228515625, 0.09576416015625,
+            0.14306640625, 0.66259765625, 0.34521484375, 0.505859375
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.65673828125, 0.182373046875, 0.61328125,     0.17578125,
+            0.8076171875,  0.46923828125,  0.5927734375,   0.09747314453125,
+            0.7041015625,  0.209228515625, 0.955078125,    0.716796875,
+            0.955078125,   0.61669921875,  0.45556640625,  0.76611328125,
+            0.69970703125, 0.58154296875,  0.492919921875, 0.6513671875
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        },
+        'inputC': {
+          'data': [
+            0.40087890625, 0.72509765625, 0.35595703125, 0.0589599609375,
+            0.1856689453125, 0.923828125, 0.0650634765625, 0.169677734375,
+            0.93603515625, 0.0208892822265625, 0.281005859375, 0.8193359375,
+            0.256591796875, 0.043365478515625, 0.222900390625
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments': [
+          {'a': 'inputA'}, {'b': 'inputB'}, {
+            'options': {
+              'c': 'inputC',
+              'alpha': -22.611149749186296,
+              'beta': -11.68521964935509
+            }
+          }
+        ],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            -36, -31.3125, -29.1875, -22.546875, -25.296875, -34.1875,
+            -18.796875, -21.109375, -28.21875, -15.2109375, -28.65625,
+            -32.65625, -20.546875, -22.078125, -19.359375
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'gemm both negative options.alpha and 3rd float16 input tensor (options.c)',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            0.95068359375, 0.211669921875, 0.203857421875, 0.198486328125,
+            0.9140625, 0.68994140625, 0.9951171875, 0.3525390625,
+            0.029266357421875, 0.128662109375, 0.1787109375, 0.91357421875
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            0.3720703125,   0.353271484375, 0.1610107421875,  0.301513671875,
+            0.75830078125,  0.18359375,     0.06787109375,    0.029083251953125,
+            0.9453125,      0.609375,       0.10418701171875, 0.80517578125,
+            0.65625,        0.77197265625,  0.5888671875,     0.916015625,
+            0.104736328125, 0.7138671875,   0.75341796875,    0.88623046875
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'},
+          'constant': true
+        },
+        'inputC': {
+          'data': [
+            0.484375, 0.97412109375, 0.072509765625, 0.439697265625,
+            0.46533203125, 0.97119140625, 0.84375, 0.0928955078125, 0.591796875,
+            0.0114898681640625, 0.47265625, 0.7490234375, 0.1689453125,
+            0.2379150390625, 0.69970703125
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'},
+          'constant': true
+        }
+      },
+      'operators': [{
+        'name': 'gemm',
+        'arguments': [
+          {'a': 'inputA'}, {'b': 'inputB'},
+          {'options': {'c': 'inputC', 'alpha': -22.611149749186296}}
+        ],
+        'outputs': 'gemmOutput'
+      }],
+      'expectedOutputs': {
+        'gemmOutput': {
+          'data': [
+            -12.984375, -11.125, -9.7578125, -17.5, -25.4375, -19.234375,
+            -26.46875, -24.140625, -43.75, -45.46875, -19.65625, -5.09765625,
+            -17.421875, -21.390625, -22.265625
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/conformance_tests/layer_normalization.https.any.js b/tests/wpt/tests/webnn/conformance_tests/layer_normalization.https.any.js
index 01f181c45b3..2af128bbaf9 100644
--- a/tests/wpt/tests/webnn/conformance_tests/layer_normalization.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/layer_normalization.https.any.js
@@ -30,6 +30,26 @@ const getLayerNormPrecisionTolerance = (graphResources) => {
 };
 
 const layerNormTests = [
+  {
+    'name': 'layerNormalization float32 0D tensor default options',
+    'graph': {
+      'inputs': {
+        'layerNormInput': {
+          'data': [-35.51446533203125],
+          'descriptor': {shape: [], dataType: 'float32'}
+        }
+      },
+      'operators': [{
+        'name': 'layerNormalization',
+        'arguments': [{'input': 'layerNormInput'}],
+        'outputs': 'layerNormOutput'
+      }],
+      'expectedOutputs': {
+        'layerNormOutput':
+            {'data': [0], 'descriptor': {shape: [], dataType: 'float32'}}
+      }
+    }
+  },
   {
     'name': 'layerNormalization float32 2D tensor default options',
     'graph': {
@@ -70,6 +90,87 @@ const layerNormTests = [
       }
     }
   },
+  {
+    'name': 'layerNormalization float32 2D tensor axes=[] and options.bias',
+    'graph': {
+      'inputs': {
+        'layerNormInput': {
+          'data': [
+            -35.51446533203125,  54.735408782958984,  19.659019470214844,
+            -15.882678031921387, 65.48657989501953,   25.818492889404297,
+            97.55302429199219,   -8.057161331176758,  62.9412956237793,
+            -48.91555404663086,  91.90644073486328,   46.67098617553711,
+            -74.85331726074219,  30.126361846923828,  26.13089370727539,
+            59.30270767211914,   -60.361995697021484, 18.55615234375,
+            -88.03730773925781,  -26.5667724609375,   70.81292724609375,
+            9.105611801147461,   56.66746139526367,   21.78444480895996
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        },
+        'layerNormBias': {
+          'data': [7.862982749938965],
+          'descriptor': {shape: [], dataType: 'float32'}
+        }
+      },
+      'operators': [{
+        'name': 'layerNormalization',
+        'arguments': [
+          {'input': 'layerNormInput'},
+          {'options': {'axes': [], 'bias': 'layerNormBias'}}
+        ],
+        'outputs': 'layerNormOutput'
+      }],
+      'expectedOutputs': {
+        'layerNormOutput': {
+          'data': [
+            7.862982749938965, 7.862982749938965, 7.862982749938965,
+            7.862982749938965, 7.862982749938965, 7.862982749938965,
+            7.862982749938965, 7.862982749938965, 7.862982749938965,
+            7.862982749938965, 7.862982749938965, 7.862982749938965,
+            7.862982749938965, 7.862982749938965, 7.862982749938965,
+            7.862982749938965, 7.862982749938965, 7.862982749938965,
+            7.862982749938965, 7.862982749938965, 7.862982749938965,
+            7.862982749938965, 7.862982749938965, 7.862982749938965
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'layerNormalization float32 2D tensor axes=[]',
+    'graph': {
+      'inputs': {
+        'layerNormInput': {
+          'data': [
+            -35.51446533203125,  54.735408782958984,  19.659019470214844,
+            -15.882678031921387, 65.48657989501953,   25.818492889404297,
+            97.55302429199219,   -8.057161331176758,  62.9412956237793,
+            -48.91555404663086,  91.90644073486328,   46.67098617553711,
+            -74.85331726074219,  30.126361846923828,  26.13089370727539,
+            59.30270767211914,   -60.361995697021484, 18.55615234375,
+            -88.03730773925781,  -26.5667724609375,   70.81292724609375,
+            9.105611801147461,   56.66746139526367,   21.78444480895996
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        }
+      },
+      'operators': [{
+        'name': 'layerNormalization',
+        'arguments': [{'input': 'layerNormInput'}, {'options': {'axes': []}}],
+        'outputs': 'layerNormOutput'
+      }],
+      'expectedOutputs': {
+        'layerNormOutput': {
+          'data': [
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+          ],
+          'descriptor': {shape: [4, 6], dataType: 'float32'}
+        }
+      }
+    }
+  },
   {
     'name': 'layerNormalization float32 3D tensor default options',
     'graph': {
diff --git a/tests/wpt/tests/webnn/conformance_tests/lstm_cell.https.any.js b/tests/wpt/tests/webnn/conformance_tests/lstm_cell.https.any.js
index 8fb7ce4ca35..7a484ec6af1 100644
--- a/tests/wpt/tests/webnn/conformance_tests/lstm_cell.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/lstm_cell.https.any.js
@@ -63,14 +63,16 @@ const lstmCellTests = [
         },
         'lstmCellWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {shape: [8, 2], dataType: 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellRecurrentWeight': {
           'data': [
             0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
             0.1, 0.1, 0.1
           ],
-          'descriptor': {shape: [8, 2], dataType: 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellHiddenState': {
           'data': [0, 0, 0, 0],
@@ -82,11 +84,13 @@ const lstmCellTests = [
         },
         'lstmCellBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {shape: [8], dataType: 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {shape: [8], dataType: 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'},
+          'constant': true
         }
       },
       'operators': [{
@@ -128,14 +132,16 @@ const lstmCellTests = [
         },
         'lstmCellWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {shape: [8, 2], dataType: 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellRecurrentWeight': {
           'data': [
             0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
             0.1, 0.1, 0.1
           ],
-          'descriptor': {shape: [8, 2], dataType: 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellHiddenState': {
           'data': [0, 0, 0, 0],
@@ -147,15 +153,18 @@ const lstmCellTests = [
         },
         'lstmCellBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {shape: [8], dataType: 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {shape: [8], dataType: 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellPeepholeWeight': {
           'data': [0, 0, 0, 0, 0, 0],
-          'descriptor': {shape: [6], dataType: 'float32'}
+          'descriptor': {shape: [6], dataType: 'float32'},
+          'constant': true
         }
       },
       'operators': [{
@@ -198,14 +207,16 @@ const lstmCellTests = [
         },
         'lstmCellWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {shape: [8, 2], dataType: 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellRecurrentWeight': {
           'data': [
             0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
             0.1, 0.1, 0.1
           ],
-          'descriptor': {shape: [8, 2], dataType: 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellHiddenState': {
           'data': [0, 0, 0, 0],
@@ -217,11 +228,13 @@ const lstmCellTests = [
         },
         'lstmCellBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {shape: [8], dataType: 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {shape: [8], dataType: 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'},
+          'constant': true
         }
       },
       'operators': [{
@@ -264,14 +277,16 @@ const lstmCellTests = [
         },
         'lstmCellWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {shape: [8, 2], dataType: 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellRecurrentWeight': {
           'data': [
             0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
             0.1, 0.1, 0.1
           ],
-          'descriptor': {shape: [8, 2], dataType: 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellHiddenState': {
           'data': [0, 0, 0, 0],
@@ -283,11 +298,13 @@ const lstmCellTests = [
         },
         'lstmCellBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {shape: [8], dataType: 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {shape: [8], dataType: 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'},
+          'constant': true
         }
       },
       'operators': [{
@@ -329,14 +346,16 @@ const lstmCellTests = [
         },
         'lstmCellWeight': {
           'data': [1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2, 1, -1, 2, -2],
-          'descriptor': {shape: [8, 2], dataType: 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellRecurrentWeight': {
           'data': [
             0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1,
             0.1, 0.1, 0.1
           ],
-          'descriptor': {shape: [8, 2], dataType: 'float32'}
+          'descriptor': {shape: [8, 2], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellHiddenState': {
           'data': [0, 0, 0, 0],
@@ -348,15 +367,18 @@ const lstmCellTests = [
         },
         'lstmCellBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {shape: [8], dataType: 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellRecurrentBias': {
           'data': [1, 2, 1, 2, 1, 2, 1, 2],
-          'descriptor': {shape: [8], dataType: 'float32'}
+          'descriptor': {shape: [8], dataType: 'float32'},
+          'constant': true
         },
         'lstmCellPeepholeWeight': {
           'data': [0, 0, 0, 0, 0, 0],
-          'descriptor': {shape: [6], dataType: 'float32'}
+          'descriptor': {shape: [6], dataType: 'float32'},
+          'constant': true
         }
       },
       'operators': [{
diff --git a/tests/wpt/tests/webnn/conformance_tests/matmul.https.any.js b/tests/wpt/tests/webnn/conformance_tests/matmul.https.any.js
index 8a16c567c8a..8d0ff1517ba 100644
--- a/tests/wpt/tests/webnn/conformance_tests/matmul.https.any.js
+++ b/tests/wpt/tests/webnn/conformance_tests/matmul.https.any.js
@@ -648,6 +648,450 @@ const matmulTests = [
         }
       }
     }
+  },
+
+  // float16 tests
+  {
+    'name': 'matmul float16 2D and 2D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            10.4296875, 24.46875, 55.875, 3.240234375, 87.5625, 22.40625,
+            79.875, 99.625, 24.734375, 65.9375, 38.125, 87.125
+          ],
+          'descriptor': {shape: [3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            88.1875,  78.375,    14.8203125, 3.69140625, 45.90625,
+            43.09375, 47.1875,   60.9375,    8.1640625,  20.328125,
+            20.4375,  27.015625, 15.6015625, 87.5,       65.8125,
+            69.3125,  31.984375, 12.2890625, 13.3046875, 85.25
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'matmul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            3340, 3586, 2558, 5172, 4928, 17232, 13264, 5132, 8824, 18224,
+            11840, 8864, 6052, 5124, 12416
+          ],
+          'descriptor': {shape: [3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'matmul float16 3D and 3D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            56.46875,  99.875,  71.0625,   32.46875,  17.3125,  2.5859375,
+            92.3125,   97,      26.46875,  77.6875,   29.28125, 82.125,
+            89.875,    82.5,    64.375,    23.765625, 6.671875, 81.5625,
+            16.140625, 57.4375, 26.828125, 85,        36.1875,  89.625
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            70.375,    25.484375, 28.25,      84.5,        58.875,   46.25,
+            24.890625, 44.09375,  51.875,     1.123046875, 4.1875,   71.25,
+            16.03125,  23.671875, 61.28125,   65.1875,     58.40625, 70.125,
+            9.1171875, 24.1875,   84.4375,    78.5625,     38.46875, 80.625,
+            57.15625,  46.125,    28.40625,   90.9375,     94.6875,  61.78125,
+            60.3125,   71,        10.6328125, 55.625,      35.0625,  22.125,
+            38.1875,   78.1875,   62.5625,    88.375
+          ],
+          'descriptor': {shape: [2, 4, 5], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'matmul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            11008, 10888, 9416,  11928, 8576,  8048, 12752, 8888,
+            4668,  9024,  10928, 9488,  10400, 7708, 5428,  15800,
+            14880, 13504, 20128, 14592, 6568,  6180, 12336, 12752,
+            11064, 10352, 10512, 16152, 17824, 15976
+          ],
+          'descriptor': {shape: [2, 3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'matmul float16 4D and 4D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            56.46875,  99.875,  71.0625,   32.46875,  17.3125,  2.5859375,
+            92.3125,   97,      26.46875,  77.6875,   29.28125, 82.125,
+            89.875,    82.5,    64.375,    23.765625, 6.671875, 81.5625,
+            16.140625, 57.4375, 26.828125, 85,        36.1875,  89.625
+          ],
+          'descriptor': {shape: [2, 1, 3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            70.375,    25.484375, 28.25,      84.5,        58.875,   46.25,
+            24.890625, 44.09375,  51.875,     1.123046875, 4.1875,   71.25,
+            16.03125,  23.671875, 61.28125,   65.1875,     58.40625, 70.125,
+            9.1171875, 24.1875,   84.4375,    78.5625,     38.46875, 80.625,
+            57.15625,  46.125,    28.40625,   90.9375,     94.6875,  61.78125,
+            60.3125,   71,        10.6328125, 55.625,      35.0625,  22.125,
+            38.1875,   78.1875,   62.5625,    88.375
+          ],
+          'descriptor': {shape: [2, 1, 4, 5], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'matmul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            11008, 10888, 9416,  11928, 8576,  8048, 12752, 8888,
+            4668,  9024,  10928, 9488,  10400, 7708, 5428,  15800,
+            14880, 13504, 20128, 14592, 6568,  6180, 12336, 12752,
+            11064, 10352, 10512, 16152, 17824, 15976
+          ],
+          'descriptor': {shape: [2, 1, 3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'matmul float16 3D and 3D (broadcast) tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            56.46875,  99.875,  71.0625,   32.46875,  17.3125,  2.5859375,
+            92.3125,   97,      26.46875,  77.6875,   29.28125, 82.125,
+            89.875,    82.5,    64.375,    23.765625, 6.671875, 81.5625,
+            16.140625, 57.4375, 26.828125, 85,        36.1875,  89.625
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [27.828125, 83.125, 34.40625, 83.1875],
+          'descriptor': {shape: [1, 4, 1], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'matmul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [15016, 11944, 15032, 13552, 12296, 16512],
+          'descriptor': {shape: [2, 3, 1], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'matmul float16 3D and 2D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            56.46875,  99.875,  71.0625,   32.46875,  17.3125,  2.5859375,
+            92.3125,   97,      26.46875,  77.6875,   29.28125, 82.125,
+            89.875,    82.5,    64.375,    23.765625, 6.671875, 81.5625,
+            16.140625, 57.4375, 26.828125, 85,        36.1875,  89.625
+          ],
+          'descriptor': {shape: [2, 3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [27.828125, 83.125, 34.40625, 83.1875],
+          'descriptor': {shape: [4, 1], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'matmul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [15016, 11944, 15032, 13552, 12296, 16512],
+          'descriptor': {shape: [2, 3, 1], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'matmul float16 4D and 4D (broadcast) tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            33.75,       97.25,    83.6875,    64.5625,   29.578125,
+            17.203125,   67.9375,  97.4375,    54.4375,   29.546875,
+            52,          36.03125, 9.703125,   27.046875, 6.01953125,
+            22.9375,     53.125,   15.2890625, 48.21875,  87.4375,
+            51.34375,    21.15625, 27.59375,   58.40625,  5.96484375,
+            84.75,       55.46875, 50.84375,   23.765625, 62.34375,
+            35.78125,    17.34375, 29.171875,  23.1875,   27.0625,
+            1.283203125, 8.71875,  48.4375,    99,        65.875,
+            92.6875,     85.4375,  37.5,       51.40625,  53.1875,
+            38.34375,    75.1875,  3.853515625
+          ],
+          'descriptor': {shape: [2, 2, 3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            88.1875,  78.375,    14.8203125, 3.69140625, 45.90625,
+            43.09375, 47.1875,   60.9375,    8.1640625,  20.328125,
+            20.4375,  27.015625, 15.6015625, 87.5,       65.8125,
+            69.3125,  31.984375, 12.2890625, 13.3046875, 85.25
+          ],
+          'descriptor': {shape: [1, 1, 4, 5], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'matmul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            13352, 11560, 8528, 9104, 14536, 11488, 8080, 3744, 7492, 14488,
+            9632,  8216,  3862, 5472, 9592,  3734,  2934, 2168, 1089, 3346,
+            12392, 8984,  3546, 5704, 13376, 10048, 7636, 3198, 3554, 9584,
+            8832,  7592,  6744, 6244, 9984,  6716,  6324, 4924, 3958, 6192,
+            4212,  4152,  2284, 2682, 3700,  9448,  7752, 5436, 9968, 13520,
+            16184, 13952, 7796, 5004, 12840, 8148,  8132, 4344, 7140, 8496
+          ],
+          'descriptor': {shape: [2, 2, 3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'matmul float16 4D and 3D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            33.75,       97.25,    83.6875,    64.5625,   29.578125,
+            17.203125,   67.9375,  97.4375,    54.4375,   29.546875,
+            52,          36.03125, 9.703125,   27.046875, 6.01953125,
+            22.9375,     53.125,   15.2890625, 48.21875,  87.4375,
+            51.34375,    21.15625, 27.59375,   58.40625,  5.96484375,
+            84.75,       55.46875, 50.84375,   23.765625, 62.34375,
+            35.78125,    17.34375, 29.171875,  23.1875,   27.0625,
+            1.283203125, 8.71875,  48.4375,    99,        65.875,
+            92.6875,     85.4375,  37.5,       51.40625,  53.1875,
+            38.34375,    75.1875,  3.853515625
+          ],
+          'descriptor': {shape: [2, 2, 3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            70.375,    25.484375, 28.25,      84.5,        58.875,   46.25,
+            24.890625, 44.09375,  51.875,     1.123046875, 4.1875,   71.25,
+            16.03125,  23.671875, 61.28125,   65.1875,     58.40625, 70.125,
+            9.1171875, 24.1875,   84.4375,    78.5625,     38.46875, 80.625,
+            57.15625,  46.125,    28.40625,   90.9375,     94.6875,  61.78125,
+            60.3125,   71,        10.6328125, 55.625,      35.0625,  22.125,
+            38.1875,   78.1875,   62.5625,    88.375
+          ],
+          'descriptor': {shape: [2, 4, 5], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'matmul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            11432, 13016, 11112, 10464, 8784,  9512,  11712, 9520,  5888,
+            8280,  7764,  7932,  6200,  7692,  7296,  2938,  2834,  4692,
+            5112,  4464,  10032, 11368, 10784, 13880, 13400, 8264,  8824,
+            8760,  11328, 10368, 7888,  9184,  8360,  6676,  5076,  5836,
+            5720,  5212,  6248,  4082,  3322,  3324,  2370,  4320,  3432,
+            10400, 11608, 10944, 14920, 12784, 15168, 14336, 15752, 20864,
+            16432, 10880, 10752, 6632,  12344, 8384
+          ],
+          'descriptor': {shape: [2, 2, 3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'matmul float16 5D and 5D tensors, broadcast the two leftmost dimensions of inputB',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            33.75,       97.25,    83.6875,    64.5625,   29.578125,
+            17.203125,   67.9375,  97.4375,    54.4375,   29.546875,
+            52,          36.03125, 9.703125,   27.046875, 6.01953125,
+            22.9375,     53.125,   15.2890625, 48.21875,  87.4375,
+            51.34375,    21.15625, 27.59375,   58.40625,  5.96484375,
+            84.75,       55.46875, 50.84375,   23.765625, 62.34375,
+            35.78125,    17.34375, 29.171875,  23.1875,   27.0625,
+            1.283203125, 8.71875,  48.4375,    99,        65.875,
+            92.6875,     85.4375,  37.5,       51.40625,  53.1875,
+            38.34375,    75.1875,  3.853515625
+          ],
+          'descriptor': {shape: [2, 2, 1, 3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            88.1875,  78.375,    14.8203125, 3.69140625, 45.90625,
+            43.09375, 47.1875,   60.9375,    8.1640625,  20.328125,
+            20.4375,  27.015625, 15.6015625, 87.5,       65.8125,
+            69.3125,  31.984375, 12.2890625, 13.3046875, 85.25
+          ],
+          'descriptor': {shape: [1, 1, 1, 4, 5], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'matmul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            13352, 11560, 8528, 9104, 14536, 11488, 8080, 3744, 7492, 14488,
+            9632,  8216,  3862, 5472, 9592,  3734,  2934, 2168, 1089, 3346,
+            12392, 8984,  3546, 5704, 13376, 10048, 7636, 3198, 3554, 9584,
+            8832,  7592,  6744, 6244, 9984,  6716,  6324, 4924, 3958, 6192,
+            4212,  4152,  2284, 2682, 3700,  9448,  7752, 5436, 9968, 13520,
+            16184, 13952, 7796, 5004, 12840, 8148,  8132, 4344, 7140, 8496
+          ],
+          'descriptor': {shape: [2, 2, 1, 3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name':
+        'matmul float16 5D and 5D tensors, broadcast the leftmost dimensions of inputB',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            33.75,       97.25,    83.6875,    64.5625,   29.578125,
+            17.203125,   67.9375,  97.4375,    54.4375,   29.546875,
+            52,          36.03125, 9.703125,   27.046875, 6.01953125,
+            22.9375,     53.125,   15.2890625, 48.21875,  87.4375,
+            51.34375,    21.15625, 27.59375,   58.40625,  5.96484375,
+            84.75,       55.46875, 50.84375,   23.765625, 62.34375,
+            35.78125,    17.34375, 29.171875,  23.1875,   27.0625,
+            1.283203125, 8.71875,  48.4375,    99,        65.875,
+            92.6875,     85.4375,  37.5,       51.40625,  53.1875,
+            38.34375,    75.1875,  3.853515625
+          ],
+          'descriptor': {shape: [2, 2, 1, 3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            88.1875,  78.375,    14.8203125, 3.69140625, 45.90625,
+            43.09375, 47.1875,   60.9375,    8.1640625,  20.328125,
+            20.4375,  27.015625, 15.6015625, 87.5,       65.8125,
+            69.3125,  31.984375, 12.2890625, 13.3046875, 85.25,
+            88.1875,  78.375,    14.8203125, 3.69140625, 45.90625,
+            43.09375, 47.1875,   60.9375,    8.1640625,  20.328125,
+            20.4375,  27.015625, 15.6015625, 87.5,       65.8125,
+            69.3125,  31.984375, 12.2890625, 13.3046875, 85.25
+          ],
+          'descriptor': {shape: [1, 2, 1, 4, 5], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'matmul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            13352, 11560, 8528, 9104, 14536, 11488, 8080, 3744, 7492, 14488,
+            9632,  8216,  3862, 5472, 9592,  3734,  2934, 2168, 1089, 3346,
+            12392, 8984,  3546, 5704, 13376, 10048, 7636, 3198, 3554, 9584,
+            8832,  7592,  6744, 6244, 9984,  6716,  6324, 4924, 3958, 6192,
+            4212,  4152,  2284, 2682, 3700,  9448,  7752, 5436, 9968, 13520,
+            16184, 13952, 7796, 5004, 12840, 8148,  8132, 4344, 7140, 8496
+          ],
+          'descriptor': {shape: [2, 2, 1, 3, 5], dataType: 'float16'}
+        }
+      }
+    }
+  },
+  {
+    'name': 'matmul float16 5D and 2D tensors',
+    'graph': {
+      'inputs': {
+        'inputA': {
+          'data': [
+            33.75,       97.25,    83.6875,    64.5625,   29.578125,
+            17.203125,   67.9375,  97.4375,    54.4375,   29.546875,
+            52,          36.03125, 9.703125,   27.046875, 6.01953125,
+            22.9375,     53.125,   15.2890625, 48.21875,  87.4375,
+            51.34375,    21.15625, 27.59375,   58.40625,  5.96484375,
+            84.75,       55.46875, 50.84375,   23.765625, 62.34375,
+            35.78125,    17.34375, 29.171875,  23.1875,   27.0625,
+            1.283203125, 8.71875,  48.4375,    99,        65.875,
+            92.6875,     85.4375,  37.5,       51.40625,  53.1875,
+            38.34375,    75.1875,  3.853515625
+          ],
+          'descriptor': {shape: [2, 2, 1, 3, 4], dataType: 'float16'}
+        },
+        'inputB': {
+          'data': [
+            88.1875,  78.375,    14.8203125, 3.69140625, 45.90625,
+            43.09375, 47.1875,   60.9375,    8.1640625,  20.328125,
+            20.4375,  27.015625, 15.6015625, 87.5,       65.8125,
+            69.3125,  31.984375, 12.2890625, 13.3046875, 85.25
+          ],
+          'descriptor': {shape: [4, 5], dataType: 'float16'}
+        }
+      },
+      'operators': [{
+        'name': 'matmul',
+        'arguments': [{'a': 'inputA'}, {'b': 'inputB'}],
+        'outputs': 'output'
+      }],
+      'expectedOutputs': {
+        'output': {
+          'data': [
+            13352, 11560, 8528, 9104, 14536, 11488, 8080, 3744, 7492, 14488,
+            9632,  8216,  3862, 5472, 9592,  3734,  2934, 2168, 1089, 3346,
+            12392, 8984,  3546, 5704, 13376, 10048, 7636, 3198, 3554, 9584,
+            8832,  7592,  6744, 6244, 9984,  6716,  6324, 4924, 3958, 6192,
+            4212,  4152,  2284, 2682, 3700,  9448,  7752, 5436, 9968, 13520,
+            16184, 13952, 7796, 5004, 12840, 8148,  8132, 4344, 7140, 8496
+          ],
+          'descriptor': {shape: [2, 2, 1, 3, 5], dataType: 'float16'}
+        }
+      }
+    }
   }
 ];
 
diff --git a/tests/wpt/tests/webnn/resources/utils.js b/tests/wpt/tests/webnn/resources/utils.js
index b1916d0a4f1..a976fc555c5 100644
--- a/tests/wpt/tests/webnn/resources/utils.js
+++ b/tests/wpt/tests/webnn/resources/utils.js
@@ -528,6 +528,132 @@ async function prepareOutputsForGraph(context, resources) {
   return outputs;
 }
 
+function getInputName(operatorArguments, operandName) {
+  for (let argument of operatorArguments) {
+    const name = Object.keys(argument)[0];
+    if (name === operandName) {
+      return argument[operandName];
+    } else if (name === 'options') {
+      if (Object.keys(argument[name]).includes(operandName)) {
+        return argument[name][operandName];
+      }
+    }
+  }
+  return null;
+}
+
+// This assert() function is to check whether configurations of test case are
+// set correctly.
+function assert(condition, message) {
+  if (!condition) {
+    throw new Error(`Wrong test case, ${message}`);
+  }
+}
+
+function validateContextSupportsGraph(context, graph) {
+  const supportLimits = context.opSupportLimits();
+  const inputDataTypes = supportLimits.input.dataTypes;
+  const constantDataTypes = supportLimits.constant.dataTypes;
+  const outputDataTypes = supportLimits.output.dataTypes;
+
+  function validateInputOrConstantDataType(
+      inputName, operatorSupportLimits, operand) {
+    const inputDataType = graph.inputs[inputName].descriptor.dataType;
+    if (graph.inputs[inputName].constant) {
+      if (!constantDataTypes.includes(inputDataType)) {
+        throw new TypeError(
+            `Unsupported data type, constant '${operand}' data type ${
+                inputDataType} must be one of [${constantDataTypes}].`);
+      }
+    } else {
+      if (!inputDataTypes.includes(inputDataType)) {
+        throw new TypeError(
+            `Unsupported data type, input '${operand}' data type ${
+                inputDataType} must be one of [${inputDataTypes}].`);
+      }
+    }
+
+    if (!operatorSupportLimits[operand].dataTypes.includes(inputDataType)) {
+      throw new TypeError(`Unsupported data type, input '${
+          operand}' data type ${inputDataType} must be one of [${
+          operatorSupportLimits[operand].dataTypes}].`);
+    }
+  }
+
+  function validateOutputDataType(outputName, operatorSupportLimits, operand) {
+    const outputDataType =
+        graph.expectedOutputs[outputName].descriptor.dataType;
+    if (!outputDataTypes.includes(outputDataType)) {
+      throw new TypeError(
+          `Unsupported data type, output '${operand}' data type ${
+              outputDataType} must be one of [${outputDataTypes}].`);
+    }
+
+    if (!operatorSupportLimits[operand].dataTypes.includes(outputDataType)) {
+      throw new TypeError(`Unsupported data type, output '${
+          operand}' data type ${outputDataType} must be one of [${
+          operatorSupportLimits[operand].dataTypes}].`);
+    }
+  }
+
+  for (let operator of graph.operators) {
+    const operatorName = operator.name;
+    const operatorSupportLimits = supportLimits[operatorName];
+    for (let operand of Object.keys(operatorSupportLimits)) {
+      if (operand === 'output') {
+        // single output operand
+        assert(
+            typeof operator.outputs === 'string',
+            `the outputs of ${operatorName} should be a string.`);
+        if (!graph.expectedOutputs[operator.outputs]) {
+          // intermediate output
+          continue;
+        }
+        validateOutputDataType(
+            operator.outputs, operatorSupportLimits, 'output');
+      } else if (operand === 'outputs') {
+        // multiples output operands
+        assert(
+            Array.isArray(operator.outputs),
+            `the outputs of ${operatorName} should be a string array.`);
+        for (const outputName of operator.outputs) {
+          assert(
+              typeof outputName === 'string',
+              `the outputs' item of ${operatorName} should be a string.`);
+          if (!graph.expectedOutputs[outputName]) {
+            // intermediate output
+            continue;
+          }
+          validateOutputDataType(outputName, operatorSupportLimits, 'outputs');
+        }
+      } else {
+        // input operand(s)
+        if (operatorName === 'concat') {
+          const inputNameArray = operator.arguments[0][operand];
+          assert(
+              Array.isArray(inputNameArray),
+              `the inputs of ${operatorName} should be a string array.`);
+          for (const inputName of inputNameArray) {
+            assert(
+                typeof inputName === 'string',
+                `the inputs' item of ${operatorName} should be a string.`);
+            validateInputOrConstantDataType(
+                inputName, operatorSupportLimits, 'inputs');
+          }
+        } else {
+          const inputName = getInputName(operator.arguments, operand);
+          if (inputName === null || !graph.inputs[inputName]) {
+            // default options argument or intermediate input
+            continue;
+          }
+          validateInputOrConstantDataType(
+              inputName, operatorSupportLimits, operand);
+        }
+      }
+    }
+  }
+}
+
 /**
  * This function is to execute the compiled graph.
  * @param {MLContext} context
@@ -825,7 +951,7 @@ const getReducedElementCount =
           sizes.reduce(
               (accumulator, currentValue) => accumulator * currentValue) :
           1;
-    }
+    };
 
 const webnn_conformance_test =
     (buildAndExecuteGraphFunc, toleranceFunc, testResources) => {
@@ -837,6 +963,7 @@ const webnn_conformance_test =
           throw new AssertionError(
               `Unable to create context for ${variant} variant. ${e}`);
         }
+        validateContextSupportsGraph(context, testResources.graph);
         const builder = new MLGraphBuilder(context);
         const {result, intermediateOperands} = await buildAndExecuteGraphFunc(
             context, builder, testResources.graph);
diff --git a/tests/wpt/tests/webrtc/simulcast/setParameters-maxFramerate.https.html b/tests/wpt/tests/webrtc/simulcast/setParameters-maxFramerate.https.html
index e404787dbd8..a1a167e0592 100644
--- a/tests/wpt/tests/webrtc/simulcast/setParameters-maxFramerate.https.html
+++ b/tests/wpt/tests/webrtc/simulcast/setParameters-maxFramerate.https.html
@@ -7,6 +7,9 @@
 <script src="../RTCPeerConnection-helper.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="../../mediacapture-streams/permission-helper.js"></script>
 <script>
 async function queryReceiverStats(pc) {
   const inboundStats = [];
@@ -34,6 +37,20 @@ function calculateFramerate(newStats, oldStats) {
   return deltaF / deltaT * 1000;
 }
 
+function calculateConservativeFramerate(newStats, oldStats) {
+  // The timestamp represents the exact point in time that the integer
+  // framesDecoded was sampled. For both samples, one time unit (say a
+  // nanosecond, i.e. virtually 0) could sway the integer framesDecoded value
+  // up to 1 frame. For checking that we don't exceed maxFramerate, in the worst
+  // case, the old timestamp is then at the end of a frame period (right before
+  // framesDecoded gets incremented) while the new timestamp is at the beginning
+  // of a frame period. Thus for avoiding intermittents we need to allow up to
+  // two frames more for the given sampling period, regardless of length.
+  const deltaF = newStats.framesDecoded - oldStats.framesDecoded - 2;
+  const deltaT = newStats.timestamp - oldStats.timestamp;
+  return deltaF / deltaT * 1000;
+}
+
 promise_test(async t => {
   const expectedFramerates = [15, 10, 5];
   const rids = [0, 1, 2];
@@ -42,13 +59,25 @@ promise_test(async t => {
   const pc2 = new RTCPeerConnection();
   t.add_cleanup(() => pc2.close());
 
-  await negotiateSimulcastAndWaitForVideo(t, rids, pc1, pc2);
+  await negotiateSimulcastAndWaitForVideo(
+    t,
+    await getCameraStream(t),
+    rids,
+    pc1,
+    pc2
+  );
 
-  // Assert that our framerate is bigger than 20, otherwise this test does not assert anything useful.
-  await new Promise(resolve => t.step_timeout(resolve, 1000)); // Wait for framerate to stabilize.
+  // Wait for framerate to stabilize.
+  await new Promise(resolve => t.step_timeout(resolve, 1000));
+
+  // Assert that our framerate is bigger than 20, otherwise this test does not
+  // assert anything useful.
   const defaultStats = await statsDelta(pc2, t);
   defaultStats.subsequentStats.forEach((_, idx) => {
-    const actualFramerate = calculateFramerate(defaultStats.subsequentStats[idx], defaultStats.initialStats[idx]);
+    const actualFramerate = calculateFramerate(
+      defaultStats.subsequentStats[idx],
+      defaultStats.initialStats[idx]
+    );
     assert_greater_than(actualFramerate, 20);
   });
 
@@ -58,7 +87,8 @@ promise_test(async t => {
     e.maxFramerate = expectedFramerates[idx];
   });
   await pc1.getSenders()[0].setParameters(parameters);
-  await new Promise(resolve => t.step_timeout(resolve, 100)); // Wait for the change to propagate to the receiver.
+  // Wait for the change to propagate to the receiver.
+  await new Promise(resolve => t.step_timeout(resolve, 100));
 
   // Assert the approximate framerate
   const newStats = await statsDelta(pc2, t);
@@ -66,9 +96,12 @@ promise_test(async t => {
   const framerates = [];
   newStats.subsequentStats.forEach((_, idx) => {
     const expectedFramerate = expectedFramerates[idx];
-    const actualFramerate = calculateFramerate(newStats.subsequentStats[idx], newStats.initialStats[idx]);
-    // Assert that the framerate is at most the expected framerate (plus a tiny bit).
-    assert_less_than(actualFramerate, expectedFramerate + 0.5);
+    const actualFramerate = calculateConservativeFramerate(
+      newStats.subsequentStats[idx],
+      newStats.initialStats[idx]
+    );
+    // Assert that the framerate is at most the expected framerate.
+    assert_less_than(actualFramerate, expectedFramerate);
     framerates.push(actualFramerate);
   });
   // Assert that the framerates are ordered as configured.
diff --git a/tests/wpt/webgl/meta/conformance/textures/image_bitmap_from_video/tex-2d-alpha-alpha-unsigned_byte.html.ini b/tests/wpt/webgl/meta/conformance/textures/image_bitmap_from_video/tex-2d-alpha-alpha-unsigned_byte.html.ini
index 621e9800403..0329003d2c8 100644
--- a/tests/wpt/webgl/meta/conformance/textures/image_bitmap_from_video/tex-2d-alpha-alpha-unsigned_byte.html.ini
+++ b/tests/wpt/webgl/meta/conformance/textures/image_bitmap_from_video/tex-2d-alpha-alpha-unsigned_byte.html.ini
@@ -2,3 +2,9 @@
   expected: TIMEOUT
   [Overall test]
     expected: NOTRUN
+
+  [WebGL test #1: createImageBitmap(source) failed: "argument could not be converted to any of: HTMLImageElement, HTMLCanvasElement, OffscreenCanvas, CSSStyleValue, Blob, ImageData"]
+    expected: FAIL
+
+  [WebGL test #3: createImageBitmap(source) failed: "argument could not be converted to any of: HTMLImageElement, HTMLCanvasElement, OffscreenCanvas, CSSStyleValue, Blob, ImageData"]
+    expected: FAIL